equal
deleted
inserted
replaced
49 |
49 |
50 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
50 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
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 |
58 |
58 |
59 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 |