smerge-mode

smerge-mode is an interactive autoloaded compiled Lisp function in `smerge-mode.el'.


(smerge-mode &optional ARG)

Minor mode to simplify editing output from the diff3 program.
With a prefix argument ARG, enable the mode if ARG is positive,
and disable it otherwise. If called from Lisp, enable the mode
if ARG is omitted or nil.
key binding
--- -------

C-c Prefix Command

C-c ^ Prefix Command

C-c ^ RET smerge-keep-current
C-c ^ = Prefix Command
C-c ^ C smerge-combine-with-next
C-c ^ E smerge-ediff
C-c ^ R smerge-refine
C-c ^ a smerge-keep-all
C-c ^ b smerge-keep-base
C-c ^ m smerge-keep-mine
C-c ^ n smerge-next
C-c ^ o smerge-keep-other
C-c ^ p smerge-prev
C-c ^ r smerge-resolve

C-c ^ = < smerge-diff-base-mine
C-c ^ = = smerge-diff-mine-other
C-c ^ = > smerge-diff-base-other