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

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

merge tools: fix typo in Beyond Compare's 3 command line...
Pascal Quantin -
r7867:01bd0efe default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -51,7 +51,7 b' filemerge.executable=/Developer/Applicat'
51 filemerge.args=-left $other -right $local -ancestor $base -merge $output
51 filemerge.args=-left $other -right $local -ancestor $base -merge $output
52 filemerge.gui=True
52 filemerge.gui=True
53
53
54 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts /solo
54 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
55 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
55 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
56 beyondcompare3.regname=ExePath
56 beyondcompare3.regname=ExePath
57 beyondcompare3.gui=True
57 beyondcompare3.gui=True
General Comments 0
You need to be logged in to leave comments. Login now