Function: smerge-keep-upper

smerge-keep-upper is an interactive and byte-compiled function defined in smerge-mode.el.gz.

Signature

(smerge-keep-upper)

Documentation

Keep the "upper" version of a merge conflict.

In a conflict that looks like:
  <<<<<<<
  UUU
  =======
  LLL
  >>>>>>>
this keeps "UUU".

Key Bindings

Aliases

smerge-keep-mine (obsolete since 26.1)

Source Code

;; Defined in /usr/src/emacs/lisp/vc/smerge-mode.el.gz
(defun smerge-keep-upper ()
  "Keep the \"upper\" version of a merge conflict.
In a conflict that looks like:
  <<<<<<<
  UUU
  =======
  LLL
  >>>>>>>
this keeps \"UUU\"."
  (interactive)
  (smerge-match-conflict)
  ;;(smerge-ensure-match 1)
  (smerge-keep-n 1)
  (smerge-auto-leave))