Function: vc-maybe-resolve-conflicts

vc-maybe-resolve-conflicts is a byte-compiled function defined in vc.el.gz.

Signature

(vc-maybe-resolve-conflicts FILE STATUS &optional NAME-A NAME-B)

Source Code

;; Defined in /usr/src/emacs/lisp/vc/vc.el.gz
(defun vc-maybe-resolve-conflicts (file status &optional _name-A _name-B)
  (vc-resynch-buffer file t (not (buffer-modified-p)))
  (if (zerop status) (message "Merge successful")
    (smerge-mode 1)
    (message "File contains conflicts.")))