aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/vc.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index e1141cb392d..4cbbf47c2d6 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1922,7 +1922,7 @@ changes from the current branch."
1922 (setq first-revision 1922 (setq first-revision
1923 (vc-read-revision 1923 (vc-read-revision
1924 (concat "Merge " file 1924 (concat "Merge " file
1925 "from branch or revision " 1925 " from branch or revision "
1926 "(default news on current branch): ") 1926 "(default news on current branch): ")
1927 (list file) 1927 (list file)
1928 backend)) 1928 backend))