Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools: add support for 32-bit BeyondCompare 3 on 64-bit Windows
authorMatt Harbison <matt_harbison@yahoo.com>
Sat, 19 Dec 2020 01:19:02 -0500
changeset 46170 968766c1a324
parent 46169 714085c1b800
child 46171 dbc462e34e92
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
mercurial/defaultrc/mergetools.rc file | annotate | diff | comparison | revisions 
--- 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
mercurial