Commit f41d99b0 authored by Chong Yidong's avatar Chong Yidong
Browse files

(vc-mark-resolved): Move message here from vc-default-mark-resolved.

(vc-default-mark-resolved): Change to an alias for ignore.
parent 51dde7dc
......@@ -1289,6 +1289,13 @@ After check-out, runs the normal hook `vc-checkout-hook'."
(with-vc-properties
files
(vc-call-backend backend 'mark-resolved files)
(message
(substitute-command-keys
"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"))
;; FIXME: Is this TRTD? Might not be.
`((vc-state . edited))))
......@@ -2452,20 +2459,12 @@ to provide the `find-revision' operation instead."
(message "Checking out %s...done" file))))
(defalias 'vc-default-revision-completion-table 'ignore)
(defalias 'vc-default-mark-resolved 'ignore)
(defun vc-default-dir-status-files (backend dir files default-state update-function)
(funcall update-function
(mapcar (lambda (file) (list file default-state)) files)))
(defun vc-default-mark-resolved (backend files)
(message
(substitute-command-keys
"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."
(interactive)
......
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