##// END OF EJS Templates
unshelve: add support for custom merge tools...
unshelve: add support for custom merge tools For parity with merge --tool, rebase --tool etc. rebase.rebase overwrites the tool in repo.ui, so we need to explicitly pass it down there too.

File last commit:

r19426:e4318468 default
r27021:f2554154 default
Show More
common.txt
8 lines | 240 B | text/plain | TextLexer
.. Common link and substitution definitions.
.. |hg(1)| replace:: **hg**\ (1)
.. _hg(1): hg.1.html
.. |hgrc(5)| replace:: **hgrc**\ (5)
.. _hgrc(5): hgrc.5.html
.. |hgignore(5)| replace:: **hgignore**\ (5)
.. _hgignore(5): hgignore.5.html