From 92d2ea2ce739d0d9ee5b09a39bb5efe46b8d471b Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 24 Sep 2008 19:14:58 +0000 Subject: [PATCH] (vc-default-mark-resolved): New function. --- lisp/vc.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lisp/vc.el b/lisp/vc.el index 88d023a422f..fa2d45e1a3a 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -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) -- 2.39.5