]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8f5f1e6) | patch
Always issue a full prompt in vc-merge-branch operation.
authorChong Yidong <cyd@stupidchicken.com>
Tue, 23 Nov 2010 15:13:43 +0000 (10:13 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 23 Nov 2010 15:13:43 +0000 (10:13 -0500)
commit3d92f44ea0c9a356ce828b07db72c432f773b94c
tree091492470d2c67dcb26b9e60831ed1064d436802tree | snapshot
parent8f5f1e686e457d046198a6894fd4eca2cf12aaaecommit | diff
Always issue a full prompt in vc-merge-branch operation.

* vc/vc.el (vc-merge): Remove optional arg PROMPT.  Always prompt
for a merge location.

* vc/vc-bzr.el (vc-bzr-pull): Remove unused var.
(vc-bzr-merge-branch): Always prompt.
(vc-bzr-async-command): Use the full branch filename.
lisp/ChangeLog diff | blob | history
lisp/vc/vc-bzr.el diff | blob | history
lisp/vc/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.