##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mergetools: add BeyondCompare 4 for Windows...
Matt Harbison -
r46786:dbc462e3 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -44,6 +44,16 b' beyondcompare3.regkey=Software\\Scooter S'
44 beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3
44 beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3
45 beyondcompare3.regname=ExePath
45 beyondcompare3.regname=ExePath
46
46
47 ; Windows version of BeyondCompare 4
48 beyondcompare4.args=$local $other $base /mergeoutput=$output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /outputtitle=merged /automerge /reviewconflicts /solo
49 beyondcompare4.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
50 beyondcompare4.gui=True
51 beyondcompare4.premerge=False
52 beyondcompare4.priority=-1
53 beyondcompare4.regkey=Software\Scooter Software\Beyond Compare 4
54 beyondcompare4.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 4
55 beyondcompare4.regname=ExePath
56
47 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
57 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
48 diffmerge.check=changed
58 diffmerge.check=changed
49 diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
59 diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
General Comments 0
You need to be logged in to leave comments. Login now