author | Matt Mackall <mpm@selenic.com> |
Mon, 04 Feb 2008 09:53:10 -0600 | |
changeset 6014 | 2f424fc4edb3 |
parent 6013 | bb441d77df99 |
child 6015 | 26ef792f834e |
--- a/contrib/mergetools.hgrc Mon Feb 04 09:51:56 2008 -0600 +++ b/contrib/mergetools.hgrc Mon Feb 04 09:53:10 2008 -0600 @@ -8,7 +8,7 @@ kdiff3.gui=True gvimdiff.args=--nofork -d -g -O $local $other $base -gvimdiff.regkey=Software\Vin\GVim +gvimdiff.regkey=Software\Vim\GVim gvimdiff.regname=path gvimdiff.priority=-9