Function: smerge-kill-current
smerge-kill-current is an interactive and byte-compiled function
defined in smerge-mode.el.gz.
Signature
(smerge-kill-current)
Documentation
Remove the current (under the cursor) version.
Key Bindings
Source Code
;; Defined in /usr/src/emacs/lisp/vc/smerge-mode.el.gz
(defun smerge-kill-current ()
"Remove the current (under the cursor) version."
(interactive)
(smerge-match-conflict)
(let ((i (smerge-get-current)))
(if (<= i 0) (error "Not inside a version")
(let ((left nil))
(dolist (n '(3 2 1))
(if (and (match-end n) (/= (match-end n) (match-end i)))
(push n left)))
(if (and (cdr left)
(/= (match-end (car left)) (match-end (cadr left))))
(ding) ;We don't know how to do that.
(smerge-keep-n (car left))
(smerge-auto-leave))))))