# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1454290578 18000
# Node ID fe18716866e9fd123180466713d25fb599ee12c4
# Parent  81ca70aa5281d86f348554f100380e8660307b91
hgrc: disable vimdiff as a merge tool forever

diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -35,6 +35,10 @@ ignore = ~/.hgglobalignore
 usehttp2=true
 mergemarkers = detailed
 
+[merge-tools]
+vimdiff.disable = yes
+gvimdiff.disable = yes
+
 [defaults]
 annotate = -nu
 serve = -v