Show More
@@ -51,8 +51,9 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.executable=C:\Program Files\Beyond Compare 3\BComp.exe |
|
|||
55 | beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts |
|
54 | beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts | |
|
55 | beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 | |||
|
56 | beyondcompare3.regname=ExePath | |||
56 | beyondcompare3.gui=True |
|
57 | beyondcompare3.gui=True | |
57 |
|
58 | |||
58 | winmerge.args=/e /u /dl local /dr other /wr $local $other $output |
|
59 | winmerge.args=/e /u /dl local /dr other /wr $local $other $output |
General Comments 0
You need to be logged in to leave comments.
Login now