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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36dd6fc8a3fd12bc237b7d3682e0c1a3f51474e2..04aa0afb690d8e86be403f77e995e8a013669dbb 100644 (file)
--- 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 e1141cb392df6a574f809f27137aaca5f0dd68b4..4cbbf47c2d673258037772447427611c579e98e5 100644 (file)
--- 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))