Commit 6e7e90fa authored by Simon Leinen's avatar Simon Leinen Committed by Chong Yidong
Browse files

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

parent f06e2758
2012-03-24 Simon Leinen <>
* vc/vc.el (vc-merge): Fix a prompt.
2012-03-24 Chong Yidong <>
* 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 <>
* newcomment.el (comment-choose-indent): No space after BOL.
......@@ -1922,7 +1922,7 @@ changes from the current branch."
(setq first-revision
(concat "Merge " file
"from branch or revision "
" from branch or revision "
"(default news on current branch): ")
(list file)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment