Skip to content
Snippets Groups Projects
Commit 714085c1 authored by Matt Harbison's avatar Matt Harbison
Browse files

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
parent 24ee0c7e
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment