Show More
@@ -101,14 +101,14 beyondcompare3.priority=-2 | |||||
101 | beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child |
|
101 | beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child | |
102 |
|
102 | |||
103 | ; Linux version of Beyond Compare |
|
103 | ; Linux version of Beyond Compare | |
104 |
bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle= |
|
104 | bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo | |
105 | bcompare.gui=True |
|
105 | bcompare.gui=True | |
106 | bcompare.priority=-1 |
|
106 | bcompare.priority=-1 | |
107 | bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child |
|
107 | bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child | |
108 |
|
108 | |||
109 | ; OS X version of Beyond Compare |
|
109 | ; OS X version of Beyond Compare | |
110 | bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp |
|
110 | bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp | |
111 |
bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle= |
|
111 | bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo | |
112 | bcomposx.gui=True |
|
112 | bcomposx.gui=True | |
113 | bcomposx.priority=-1 |
|
113 | bcomposx.priority=-1 | |
114 | bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child |
|
114 | bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child |
General Comments 0
You need to be logged in to leave comments.
Login now