##// 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
Matt Harbison -
r46784:714085c1 default
Show More
Name Size Modified Last Commit Author
/ mercurial / defaultrc
__init__.py Loading ...
mergetools.rc Loading ...