Patchwork D9633: mergetools: enable the `checkconflicts` option for Araxis Merge

login
register
mail settings
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

phabricator - Dec. 19, 2020, 7:11 a.m.
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




To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

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