Function: smerge-keep-lower
smerge-keep-lower is an interactive and byte-compiled function defined
in smerge-mode.el.gz.
Signature
(smerge-keep-lower)
Documentation
Keep the "lower" version of a merge conflict.
In a conflict that looks like:
<<<<<<<
UUU
=======
LLL
>>>>>>>
this keeps "LLL".
Key Bindings
Aliases
smerge-keep-other (obsolete since 26.1)
Source Code
;; Defined in /usr/src/emacs/lisp/vc/smerge-mode.el.gz
(defun smerge-keep-lower ()
"Keep the \"lower\" version of a merge conflict.
In a conflict that looks like:
<<<<<<<
UUU
=======
LLL
>>>>>>>
this keeps \"LLL\"."
(interactive)
(smerge-match-conflict)
;;(smerge-ensure-match 3)
(smerge-keep-n 3)
(smerge-auto-leave))