Patchwork D5255: mergetools: adjust Beyond Compare config on Mac/Linux

login
register
mail settings
Submitter phabricator
Date Nov. 15, 2018, 11:34 a.m.
Message ID <bf413636c592e5e7bd8e4b56c30236a4@localhost.localdomain>
Download mbox | patch
Permalink /patch/36603/
State Not Applicable
Headers show

Comments

phabricator - Nov. 15, 2018, 11:34 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa182dc714afa: mergetools: adjust Beyond Compare config on Mac/Linux (authored by joco &lt;joco@google.com&gt;, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5255?vs=12503&id=12550

REVISION DETAIL
  https://phab.mercurial-scm.org/D5255

AFFECTED FILES
  mercurial/default.d/mergetools.rc

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

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
@@ -101,14 +101,14 @@ 
 beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
 
 ; Linux version of Beyond Compare
-bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
+bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo
 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.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo
 bcomposx.gui=True
 bcomposx.priority=-1
 bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child