This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9634

mergetools: add support for 32-bit BeyondCompare 3 on 64-bit Windows
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG968766c1a324: mergetools: add support for 32-bit BeyondCompare 3 on 64-bit Windows
Summary

Again, marginal usefulness, but other tools have this config and it eliminates a
diff from the TortoiseHg 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 (1 line)

Diff 24463

mercurial/defaultrc/mergetools.rc

bcomposx.priority=-1 bcomposx.priority=-1
; Windows version of BeyondCompare 3 ; Windows version of BeyondCompare 3
beyondcompare3.args=$local $other $base $output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /automerge /reviewconflicts /solo beyondcompare3.args=$local $other $base $output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /automerge /reviewconflicts /solo
beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
beyondcompare3.gui=True beyondcompare3.gui=True
beyondcompare3.priority=-2 beyondcompare3.priority=-2
beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3
beyondcompare3.regname=ExePath beyondcompare3.regname=ExePath
diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
diffmerge.check=changed diffmerge.check=changed
diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
diffmerge.gui=True diffmerge.gui=True
diffmerge.priority=-7 diffmerge.priority=-7
diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\