Mercurial > emacs
diff admin/CPP-DEFINES @ 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 | 8da4f8bf7244 |
children | e5d5a84b3021 |