diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-11-23 10:13:43 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-23 10:13:43 -0500 |
| commit | 3d92f44ea0c9a356ce828b07db72c432f773b94c (patch) | |
| tree | 091492470d2c67dcb26b9e60831ed1064d436802 /lisp/eshell/esh-arg.el | |
| parent | 8f5f1e686e457d046198a6894fd4eca2cf12aaae (diff) | |
| download | emacs-3d92f44ea0c9a356ce828b07db72c432f773b94c.tar.gz emacs-3d92f44ea0c9a356ce828b07db72c432f773b94c.tar.bz2 emacs-3d92f44ea0c9a356ce828b07db72c432f773b94c.zip | |
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.
Diffstat (limited to 'lisp/eshell/esh-arg.el')
0 files changed, 0 insertions, 0 deletions