From: Simon Leinen <simon.leinen@gmail.com>
Date: Sat, 24 Mar 2012 13:23:23 +0000 (+0800)
Subject: * vc/vc.el (vc-merge): Fix a prompt.
X-Git-Tag: emacs-pretest-24.0.05~63
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e7e90fa24df8bddeab77f9846d74e06f75ed9bc;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36dd6fc8a3f..04aa0afb690 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,14 @@
+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.
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."
 	  (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))