##// END OF EJS Templates
mergetools: enable the `checkconflicts` option for Araxis Merge...
mergetools: enable the `checkconflicts` option for Araxis Merge This must have been a typo. This matches the config read in filemerge, as well as the TortoiseHg config file. Differential Revision: https://phab.mercurial-scm.org/D9633

File last commit:

r44323:1390bb81 default
r46784:714085c1 default
Show More
__init__.py
0 lines | 0 B | text/x-python | PythonLexer