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

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

mergetools: add support for 32-bit BeyondCompare 3 on 64-bit Windows...
Matt Harbison -
r46785:968766c1 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -41,6 +41,7 b' beyondcompare3.diffargs=/lro /lefttitle='
41 beyondcompare3.gui=True
41 beyondcompare3.gui=True
42 beyondcompare3.priority=-2
42 beyondcompare3.priority=-2
43 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
43 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
44 beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3
44 beyondcompare3.regname=ExePath
45 beyondcompare3.regname=ExePath
45
46
46 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
47 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
General Comments 0
You need to be logged in to leave comments. Login now