Mercurial > hg-stable
changeset 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 | 8ca263d9f070 |
| children | d8e0c591781c |
| files | mercurial/default.d/mergetools.rc |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/default.d/mergetools.rc Wed Jan 21 00:02:17 2015 +0100 +++ b/mercurial/default.d/mergetools.rc Fri Feb 27 21:42:58 2015 +0100 @@ -102,6 +102,13 @@ bcompare.priority=-1 bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child +; OS X version of Beyond Compare +bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp +bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo +bcomposx.gui=True +bcomposx.priority=-1 +bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child + winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output winmerge.regkey=Software\Thingamahoochie\WinMerge winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\