diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-10-20 01:52:22 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-10-20 01:52:22 +0000 |
| commit | 2daf4bc6670f7a8004cf25c367888102190b4214 (patch) | |
| tree | 9d5f3129b4a0983b3fa9acee258f32aa1fe51bdb /lisp/diff-mode.el | |
| parent | 05849e2ab9213987e862245a06eec37223ee2c36 (diff) | |
| download | emacs-2daf4bc6670f7a8004cf25c367888102190b4214.tar.gz emacs-2daf4bc6670f7a8004cf25c367888102190b4214.tar.bz2 emacs-2daf4bc6670f7a8004cf25c367888102190b4214.zip | |
(smerge-auto-refine): New var.
(smerge-next, smerge-prev): Use it.
(smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
Diffstat (limited to 'lisp/diff-mode.el')
0 files changed, 0 insertions, 0 deletions