* vc/vc.el (vc-merge): Fix a prompt.

6e7e90fa · Simon Leinen · Chong Yidong · f06e2758 · 6e7e90fa · 6e7e90fa
Commit 6e7e90fa authored Mar 24, 2012 by Simon Leinen Committed by Chong Yidong Mar 24, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +6 -0

lisp/vc/vc.el lisp/vc/vc.el +1 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+2012-03-24  Simon Leinen  <simon.leinen@gmail.com>
+
+	* vc/vc.el (vc-merge): Fix a prompt.
+
 2012-03-24  Chong Yidong  <cyd@gnu.org>

 	* mwheel.el (mwheel-scroll): Call deactivate-mark at the right
 	point (Bug#9623).

+	* button.el (button-at): Minor addition to docstring.
+
 2012-03-23  Stefan Monnier  <monnier@iro.umontreal.ca>

 	* newcomment.el (comment-choose-indent): No space after BOL.

--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1922,7 +1922,7 @@ changes from the current branch."
 	  (setq first-revision
 		(vc-read-revision
 		 (concat "Merge " file
-			 "from branch or revision "
+			 " from branch or revision "
 			 "(default news on current branch): ")
 		 (list file)
 		 backend))