diff options
| author | Miles Bader <miles@gnu.org> | 2007-12-16 05:08:49 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-12-16 05:08:49 +0000 |
| commit | d29ee6b1a110cf5d170a10317a96acbbd4a1c68b (patch) | |
| tree | 58f3c40766d8d56de7d2b026c29e198764d910aa /lisp/vc-cvs.el | |
| parent | 7e095e45a3f790e4608c88db9648d248e24901dc (diff) | |
| parent | 47854a55680b5809811caf72f66ecbe8289c2855 (diff) | |
| download | emacs-d29ee6b1a110cf5d170a10317a96acbbd4a1c68b.tar.gz emacs-d29ee6b1a110cf5d170a10317a96acbbd4a1c68b.tar.bz2 emacs-d29ee6b1a110cf5d170a10317a96acbbd4a1c68b.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
Diffstat (limited to 'lisp/vc-cvs.el')
| -rw-r--r-- | lisp/vc-cvs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index c9c50fceba2..6d57a329b0c 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -351,7 +351,7 @@ its parents." ((re-search-forward "Up-to-date check failed" nil t) (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge)) files) - (error (substitute-command-keys + (error "%s" (substitute-command-keys (concat "Up-to-date check failed: " "type \\[vc-next-action] to merge in changes")))) (t |