# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2020-12-19 06:15:44
# Node ID 714085c1b800327365bebd78332991676e5d1a6b
# Parent  24ee0c7e7fd2e89b394d146200dc83fe847e5f9b

mergetools: enable the `checkconflicts` option for Araxis Merge

This must have been a typo.  This matches the config read in filemerge, as well
as the TortoiseHg config file.

Differential Revision: https://phab.mercurial-scm.org/D9633

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