[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/09/24 19:14:59

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -b -r1.701 -r1.702
--- vc.el       7 Sep 2008 20:24:29 -0000       1.701
+++ vc.el       24 Sep 2008 19:14:58 -0000      1.702
@@ -2457,6 +2457,15 @@
   (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)