Mercurial > emacs
diff lib-src/emacsclient.c @ 87767:90318261ac4d
(smerge-refine): Also work on "same change conflicts".
(smerge-makeup-conflict): New command.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 15 Jan 2008 21:40:09 +0000 |
parents | e89ccaac023a |
children | e66c061f4966 |