[Updated] D9633: mergetools: enable the `checkconflicts` option for Araxis Merge

[mharbison72 (Matt Harbison)]

Closed by commit rHG714085c1b800: mergetools: enable the `checkconflicts` option for Araxis Merge (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D9633?vs=24439&id=24462

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D9633/new/

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, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20201221/bbcb0c7d/attachment-0002.html>