Mercurial > emacs
changeset 98326:c5442f509109
(vc-default-mark-resolved): New function.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 24 Sep 2008 19:14:58 +0000 |
| parents | a15398006f0d |
| children | d83896198aae |
| files | lisp/vc.el |
| diffstat | 1 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc.el Wed Sep 24 19:14:48 2008 +0000 +++ b/lisp/vc.el Wed Sep 24 19:14:58 2008 +0000 @@ -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)