Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools: enable the `checkconflicts` option for Araxis Merge
authorMatt Harbison <matt_harbison@yahoo.com>
Sat, 19 Dec 2020 01:15:44 -0500
changeset 46169 714085c1b800
parent 46168 24ee0c7e7fd2
child 46170 968766c1a324
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
mercurial/defaultrc/mergetools.rc file | annotate | diff | comparison | revisions 
--- a/mercurial/defaultrc/mergetools.rc	Sat Dec 19 01:10:57 2020 -0500
+++ b/mercurial/defaultrc/mergetools.rc	Sat Dec 19 01:15:44 2020 -0500
@@ -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
Mercurial