Mercurial > emacs
diff msdos/mainmake.v2 @ 85465:b9fe84d8ca5a
(smerge-auto-refine): New var.
(smerge-next, smerge-prev): Use it.
(smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sat, 20 Oct 2007 01:52:22 +0000 |
parents | 7d31ae4193f1 |
children | 319d87609e42 f55f9811f5d7 |