diff --git a/mercurial/defaultrc/mergetools.rc b/mercurial/defaultrc/mergetools.rc index 24ee0c7e7fd2e89b394d146200dc83fe847e5f9b_bWVyY3VyaWFsL2RlZmF1bHRyYy9tZXJnZXRvb2xzLnJj..714085c1b800327365bebd78332991676e5d1a6b_bWVyY3VyaWFsL2RlZmF1bHRyYy9tZXJnZXRvb2xzLnJj 100644 --- 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