]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 63e7dd4) | patch
vc-hg: prompt for branch to merge
authorAndrii Kolomoiets <andreyk.mad@gmail.com>
Sat, 23 Nov 2019 16:43:47 +0000 (18:43 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 30 Nov 2019 12:00:16 +0000 (14:00 +0200)
commit561840b553274207f814b33a211ce7e12c92c9a6
tree1edfc931b952a97a784f2ebeb4cb03632afdfc7btree | snapshot
parent63e7dd4360bd687ea518138b63ef745e30099f4ccommit | diff
vc-hg: prompt for branch to merge

* lisp/vc/vc-hg.el (vc-hg-merge-branch): Prompt for revision to merge.
(vc-hg-revision-table): Use branches, tags and bookmarks as competion
candidates.

* etc/NEWS: Mention changes of vc-hg.el

* doc/emacs/maintaining.texi (Switching Branches): Mention 'hg update'
command.
(Merging): Mention 'hg merge' command.

This fixes bug#22860
doc/emacs/maintaining.texi diff | blob | history
etc/NEWS diff | blob | history
lisp/vc/vc-hg.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.