Commit 92d2ea2c authored by Chong Yidong's avatar Chong Yidong
Browse files

(vc-default-mark-resolved): New function.

parent b1a6746f
......@@ -2457,6 +2457,15 @@ to provide the `find-revision' operation instead."
(funcall update-function
(mapcar (lambda (file) (list file default-state)) files)))
(defun vc-default-mark-resolved (backend files)
"Conflicts have been resolved in %s. \
Type \\[vc-next-action] to check in changes.")
(if (> (length files) 1)
(format "%d files" (length files))
"this file")))
(defun vc-check-headers ()
"Check if the current file has any headers in it."
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment