# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1458007407 14400
# Node ID 40c0bc5ff266abe77065b15a3f99bc1f6c3dbc6d
# Parent  98480bc457ab0e7460b2abc6fef36a53f8e71e92
hg: really end vimdiff's reign of terror

In fe18716866 I left off the trailing 'd' on 'disabled', because I
forgot how my own change to core Mercurial worked.

diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -34,8 +34,8 @@ usehttp2=true
 mergemarkers = detailed
 
 [merge-tools]
-vimdiff.disable = yes
-gvimdiff.disable = yes
+vimdiff.disabled = yes
+gvimdiff.disabled = yes
 
 [defaults]
 annotate = -nu