[Emacs-diffs] /srv/bzr/emacs/trunk r107669: * vc/vc.el (vc-merge): Fix a prompt.

[Chong Yidong]

------------------------------------------------------------
revno: 107669
author: Simon Leinen <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-03-24 21:23:23 +0800
message:
  * vc/vc.el (vc-merge): Fix a prompt.
modified:
  lisp/ChangeLog
  lisp/vc/vc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-24 11:05:39 +0000
+++ b/lisp/ChangeLog    2012-03-24 13:23:23 +0000
@@ -1,8 +1,14 @@
+2012-03-24  Simon Leinen  <address@hidden>
+
+       * vc/vc.el (vc-merge): Fix a prompt.
+
 2012-03-24  Chong Yidong  <address@hidden>
 
        * 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  <address@hidden>
 
        * newcomment.el (comment-choose-indent): No space after BOL.

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2012-02-09 06:25:18 +0000
+++ b/lisp/vc/vc.el     2012-03-24 13:23:23 +0000
@@ -1922,7 +1922,7 @@
          (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))