This is an archive of the discontinued Mercurial Phabricator instance.

mergetools: enable the `checkconflicts` option for Araxis Merge
ClosedPublic

Authored by mharbison72 on Dec 19 2020, 2:11 AM.

Details

Summary

This must have been a typo. This matches the config read in filemerge, as well
as the TortoiseHg config file.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.