Patchwork D9634: mergetools: add support for 32-bit BeyondCompare 3 on 64-bit Windows

login
register
mail settings
Submitter phabricator
Date Dec. 19, 2020, 7:11 a.m.
Message ID <differential-rev-PHID-DREV-f3tj2mr6mn42rjtc57m2-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47944/
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
  Again, marginal usefulness, but other tools have this config and it eliminates a
  diff from the TortoiseHg file.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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
@@ -41,6 +41,7 @@ 
 beyondcompare3.gui=True
 beyondcompare3.priority=-2
 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
+beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3
 beyondcompare3.regname=ExePath
 
 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output