Mercurial > emacs
comparison lisp/vc/cvs-status.el @ 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 | d928a6a7c3f2 |
| children | c77749185234 0889087d741a |
comparison
equal
deleted
inserted
replaced
| 111684:280ee0988e1a | 111685:411dce7ee068 |
|---|