diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-09-24 19:14:58 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-09-24 19:14:58 +0000 |
| commit | 92d2ea2ce739d0d9ee5b09a39bb5efe46b8d471b (patch) | |
| tree | 75a7a1c7ebe2e60cfc440df0cd1c5f4a68079f84 /lisp/vc.el | |
| parent | b1a6746fb868a1979586939cccbfdb40595b5499 (diff) | |
| download | emacs-92d2ea2ce739d0d9ee5b09a39bb5efe46b8d471b.tar.gz | |
(vc-default-mark-resolved): New function.
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 9 |
1 files changed, 9 insertions, 0 deletions
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) |