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
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