Submitter | phabricator |
---|---|
Date | Dec. 19, 2020, 7:11 a.m. |
Message ID | <differential-rev-PHID-DREV-ckvodssu3az4wz7tm5ac-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47943/ |
State | Superseded |
Headers | show |
Comments
Patch
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