Patchwork [3,of,4,random] merge-tools: configuration for Beyond Compare on OS X

login
register
mail settings
Submitter Mads Kiilerich
Date Feb. 27, 2015, 8:45 p.m.
Message ID <a4232f35c43c74018c9b.1425069917@madski>
Download mbox | patch
Permalink /patch/7852/
State Accepted
Commit 14d647d25c7078ef9acede614ee2ef1c1ca27164
Headers show

Comments

Mads Kiilerich - Feb. 27, 2015, 8:45 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1425069778 -3600
#      Fri Feb 27 21:42:58 2015 +0100
# Node ID a4232f35c43c74018c9b7ffcd1e8fc62a3819a5f
# Parent  abc351ec02d3c6d14cf9651cab970c31b45ecb29
merge-tools: configuration for Beyond Compare on OS X

Based on the Linux configuration entry.

Patch

diff --git a/mercurial/default.d/mergetools.rc b/mercurial/default.d/mergetools.rc
--- a/mercurial/default.d/mergetools.rc
+++ b/mercurial/default.d/mergetools.rc
@@ -102,6 +102,13 @@  bcompare.gui=True
 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\