# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1425069778 -3600
# Node ID 14d647d25c7078ef9acede614ee2ef1c1ca27164
# Parent  8ca263d9f0700a329a04806c808efb53c6b5983a
merge-tools: configuration for Beyond Compare on OS X

Based on the Linux configuration entry.

diff -r 8ca263d9f070 -r 14d647d25c70 mercurial/default.d/mergetools.rc
--- 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\