Mercurial > emacs

comparison lisp/ediff-merg.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 6169b51037af
children 402a04b0362f d1c5430c5bff
comparison
equal deleted inserted replaced
72890:5ba1cd1da822 72891:24025d20791a