Show More
| @@ -102,6 +102,13 b' bcompare.gui=True' | |||
|
|
102 | 102 | bcompare.priority=-1 |
|
|
103 | 103 | bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child |
|
|
104 | 104 | |
|
|
105 | ; OS X version of Beyond Compare | |
|
|
106 | bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp | |
|
|
107 | bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo | |
|
|
108 | bcomposx.gui=True | |
|
|
109 | bcomposx.priority=-1 | |
|
|
110 | bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child | |
|
|
111 | ||
|
|
105 | 112 | winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output |
|
|
106 | 113 | winmerge.regkey=Software\Thingamahoochie\WinMerge |
|
|
107 | 114 | winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ |
General Comments 0
You need to be logged in to leave comments.
Login now