# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1608358742 18000
# Node ID 968766c1a324deedf1373c82ead42cf394b0a9b7
# Parent  714085c1b800327365bebd78332991676e5d1a6b
mergetools: add support for 32-bit BeyondCompare 3 on 64-bit Windows

Again, marginal usefulness, but other tools have this config and it eliminates a
diff from the TortoiseHg file.

Differential Revision: https://phab.mercurial-scm.org/D9634

diff -r 714085c1b800 -r 968766c1a324 mercurial/defaultrc/mergetools.rc
--- a/mercurial/defaultrc/mergetools.rc	Sat Dec 19 01:15:44 2020 -0500
+++ b/mercurial/defaultrc/mergetools.rc	Sat Dec 19 01:19:02 2020 -0500
@@ -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