| commit | 3d92f44ea0c9a356ce828b07db72c432f773b94c | |
| author | Chong Yidong <cyd@stupidchicken.com> | |
| Tue, 23 Nov 2010 15:13:43 +0000 (23 10:13 -0500) | ||
| committer | Chong Yidong <cyd@stupidchicken.com> | |
| Tue, 23 Nov 2010 15:13:43 +0000 (23 10:13 -0500) | ||
| tree | 091492470d2c67dcb26b9e60831ed1064d436802 | treesnapshot (tar.gz zip) |
| parent | 8f5f1e686e457d046198a6894fd4eca2cf12aaae | commitdiff |
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.
* 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 | diffblobblamehistory | |
| lisp/vc/vc-bzr.el | diffblobblamehistory | |
| lisp/vc/vc.el | diffblobblamehistory |