Mercurial > emacs

diff lisp/smerge-mode.el @ 72891:24025d20791a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix previous commit: Remove conflict marker. Undo unification of Pavel Janik's name.
author Reiner Steib <Reiner.Steib@gmx.de>
date Fri, 15 Sep 2006 09:03:48 +0000
parents 2b77fa42947f
children e3694f1cb928 d9f8d2a65d18 2ecafc6d5db7
line wrap: on
line diff