Merge /home/leinen/cl/fluxoscope/snmp-get-info.lispfrom branch or revision (default news on current branch):
Here's the one-character fix. Hopefully Gmail doesn't break the patch, otherwise I can resend it as an attachment.
Simon.
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog 2012-03-23 02:46:31 +0000
+++ lisp/ChangeLog 2012-03-24 10:44:48 +0000
@@ -1,3 +1,8 @@
+
+ * vc/vc.el (vc-merge): Added missing space to the message that
+ asks for the first branch/revision.
+
* newcomment.el (comment-choose-indent): No space after BOL.
=== modified file 'lisp/vc/vc.el'
--- lisp/vc/vc.el 2012-02-09 06:25:18 +0000
+++ lisp/vc/vc.el 2012-03-24 10:37:02 +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))