Patchwork D9635: mergetools: add BeyondCompare 4 for Windows

login
register
mail settings
Submitter phabricator
Date Dec. 19, 2020, 7:11 a.m.
Message ID <differential-rev-PHID-DREV-k42hy3h2code2bke2h3f-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47945/
State Superseded
Headers show

Comments

phabricator - Dec. 19, 2020, 7:11 a.m.
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This is a copy of the TortoiseHg configuration, but dropping the 3-way diff and
  dirdiff settings (since those aren't supported in core Mercurial), and swapping
  the 'parent1', 'parent2', and 'base' literals for `$labellocal`, `$labelother,
  and `$labelbase` respectively.  (That functionality was apparently never ported
  to TortoiseHg.)
  
  Additionally, the single quotes were removed from around these arguments, since
  none of the other configs have them.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/defaultrc/mergetools.rc

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/defaultrc/mergetools.rc b/mercurial/defaultrc/mergetools.rc
--- a/mercurial/defaultrc/mergetools.rc
+++ b/mercurial/defaultrc/mergetools.rc
@@ -44,6 +44,16 @@ 
 beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3
 beyondcompare3.regname=ExePath
 
+; Windows version of BeyondCompare 4
+beyondcompare4.args=$local $other $base /mergeoutput=$output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /outputtitle=merged /automerge /reviewconflicts /solo
+beyondcompare4.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
+beyondcompare4.gui=True
+beyondcompare4.premerge=False
+beyondcompare4.priority=-1
+beyondcompare4.regkey=Software\Scooter Software\Beyond Compare 4
+beyondcompare4.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 4
+beyondcompare4.regname=ExePath
+
 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
 diffmerge.check=changed
 diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child