Mercurial > hg
comparison mercurial/default.d/mergetools.rc @ 24179:14d647d25c70
merge-tools: configuration for Beyond Compare on OS X
Based on the Linux configuration entry.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 27 Feb 2015 21:42:58 +0100 |
| parents | 6564ec382560 |
| children | f6e2e42fb8ef |
comparison
equal
deleted
inserted
replaced
| 24178:8ca263d9f070 | 24179:14d647d25c70 |
|---|---|
| 100 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo | 100 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo |
| 101 bcompare.gui=True | 101 bcompare.gui=True |
| 102 bcompare.priority=-1 | 102 bcompare.priority=-1 |
| 103 bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child | 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 winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output | 112 winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output |
| 106 winmerge.regkey=Software\Thingamahoochie\WinMerge | 113 winmerge.regkey=Software\Thingamahoochie\WinMerge |
| 107 winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ | 114 winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ |
| 108 winmerge.regname=Executable | 115 winmerge.regname=Executable |
| 109 winmerge.check=changed | 116 winmerge.check=changed |