| commit | 2daf4bc6670f7a8004cf25c367888102190b4214 | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Sat, 20 Oct 2007 01:52:22 +0000 (20 01:52 +0000) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Sat, 20 Oct 2007 01:52:22 +0000 (20 01:52 +0000) | ||
| tree | 9d5f3129b4a0983b3fa9acee258f32aa1fe51bdb | treesnapshot (tar.gz zip) |
| parent | 05849e2ab9213987e862245a06eec37223ee2c36 | commitdiff |
(smerge-auto-refine): New var.
(smerge-next, smerge-prev): Use it.
(smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
(smerge-next, smerge-prev): Use it.
(smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
| lisp/ChangeLog | diffblobblamehistory | |
| lisp/smerge-mode.el | diffblobblamehistory |