This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9633

mergetools: enable the `checkconflicts` option for Araxis Merge
ClosedPublic

Authored by mharbison72 on Dec 19 2020, 2:11 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG714085c1b800: mergetools: enable the `checkconflicts` option for Araxis Merge
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/defaultrc/mergetools.rc (2 lines)

Diff 24462

mercurial/defaultrc/mergetools.rc

; ;
;araxis.executable=${ProgramFiles}/Araxis/Araxis Merge/ConsoleCompare.exe ;araxis.executable=${ProgramFiles}/Araxis/Araxis Merge/ConsoleCompare.exe
;araxis.executable=${ProgramFiles(x86)}/Araxis/Araxis Merge/ConsoleCompare.exe ;araxis.executable=${ProgramFiles(x86)}/Araxis/Araxis Merge/ConsoleCompare.exe
; ;
; Please remember to remove the leading ";" to uncomment the line ; Please remember to remove the leading ";" to uncomment the line
; ;
araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
araxis.binary=True araxis.binary=True
araxis.checkconflict=True araxis.checkconflicts=True
araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child
araxis.gui=True araxis.gui=True
araxis.priority=-2 araxis.priority=-2
araxis.regappend=\ConsoleCompare.exe araxis.regappend=\ConsoleCompare.exe
araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
; Linux version of BeyondCompare 3 and 4 (dirdiff is version 4 only) ; Linux version of BeyondCompare 3 and 4 (dirdiff is version 4 only)
bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo