##// 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.
Siddharth Agarwal -
r27021:f2554154 default
Show More
Name Size Modified Last Commit Author
/ mercurial / pure
__init__.py Loading ...
base85.py Loading ...
bdiff.py Loading ...
diffhelpers.py Loading ...
mpatch.py Loading ...
osutil.py Loading ...
parsers.py Loading ...