mharbison72 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY This must have been a typo. This matches the config read in filemerge, as well as the TortoiseHg config file. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9633 AFFECTED FILES mercurial/defaultrc/mergetools.rc CHANGE DETAILS diff --git a/mercurial/defaultrc/mergetools.rc b/mercurial/defaultrc/mergetools.rc --- a/mercurial/defaultrc/mergetools.rc +++ b/mercurial/defaultrc/mergetools.rc @@ -15,7 +15,7 @@ ; araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output araxis.binary=True -araxis.checkconflict=True +araxis.checkconflicts=True araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child araxis.gui=True araxis.priority=-2 To: mharbison72, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
