martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Simon Leinen
2012-03-24 21:23:23 +08:00
committed by Chong Yidong
parent f06e2758ba
commit 6e7e90fa24
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@@ -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.

2
lisp/vc/vc.el
View File

@@ -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))