Function: vc-svn-resolve-when-done

vc-svn-resolve-when-done is a byte-compiled function defined in vc-svn.el.gz.

Signature

(vc-svn-resolve-when-done)

Documentation

Call "svn resolved" if the conflict markers have been removed.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/vc-svn.el.gz
(defun vc-svn-resolve-when-done ()
  "Call \"svn resolved\" if the conflict markers have been removed."
  (save-excursion
    (goto-char (point-min))
    (unless (re-search-forward "^<<<<<<< " nil t)
      (vc-svn-command nil 0 buffer-file-name "resolved")
      ;; Remove the hook so that it is not called multiple times.
      (remove-hook 'after-save-hook #'vc-svn-resolve-when-done t))))