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
Please register or sign in to comment