1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-28 19:00:42 -08:00
emacs/lisp/vc
Chong Yidong 3d92f44ea0 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.
2010-11-23 10:13:43 -05:00
..
add-log.el
compare-w.el
cvs-status.el
diff-mode.el
diff.el Cleanup diff-buffer-with-file. 2010-11-22 14:22:03 -05:00
ediff-diff.el
ediff-help.el
ediff-hook.el
ediff-init.el
ediff-merg.el
ediff-mult.el
ediff-ptch.el
ediff-util.el
ediff-vers.el
ediff-wind.el
ediff.el
emerge.el
log-edit.el
log-view.el
pcvs-defs.el
pcvs-info.el
pcvs-parse.el
pcvs-util.el
pcvs.el
smerge-mode.el
vc-annotate.el
vc-arch.el
vc-bzr.el Always issue a full prompt in vc-merge-branch operation. 2010-11-23 10:13:43 -05:00
vc-cvs.el
vc-dav.el
vc-dir.el
vc-dispatcher.el
vc-git.el
vc-hg.el
vc-hooks.el
vc-mtn.el
vc-rcs.el
vc-sccs.el
vc-svn.el
vc.el Always issue a full prompt in vc-merge-branch operation. 2010-11-23 10:13:43 -05:00