Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-19 03:17:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Chong Yidong 2008-09-24 19:14:58 +00:00
parent b1a6746fb8
commit 92d2ea2ce7
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/vc.el
View file

@ -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)
(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)