Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
6e7e90fa
Commit
6e7e90fa
authored
Mar 24, 2012
by
Simon Leinen
Committed by
Chong Yidong
Mar 24, 2012
Browse files
* vc/vc.el (vc-merge): Fix a prompt.
parent
f06e2758
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
lisp/ChangeLog
lisp/ChangeLog
+6
-0
lisp/vc/vc.el
lisp/vc/vc.el
+1
-1
No files found.
lisp/ChangeLog
View file @
6e7e90fa
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.
...
...
lisp/vc/vc.el
View file @
6e7e90fa
...
...
@@ -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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment