Mercurial > emacs
comparison lwlib/lwlib-Xlw.c @ 111685:411dce7ee068
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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 23 Nov 2010 10:13:43 -0500 |
| parents | 33021b778d4d |
| children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
| 111684:280ee0988e1a | 111685:411dce7ee068 |
|---|