# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1498527258 14400
# Node ID 7b075a4427d876466ca537f2aa2f19ed574d5c20
# Parent  f524f24b23ddb967007b5d26088b09d7039f801b
mergetools

diff --git a/.gitconfig b/.gitconfig
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,6 +17,9 @@
 [diff]
 	compactionheuristic = true
 
+[merge]
+	tool = vimdiff2
+
 [alias]
 	ci       = commit
 	rec      = commit -p
diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -25,7 +25,7 @@ draft = log -r 'not public()'
 
 [merge-tools]
 vimdiff.executable = vim
-vimdiff.args       = -d $base $local $output $other +close +close
+vimdiff.args       = -d -c 'hid|hid' $base $local $output $other
 vimdiff.check      = changed, conflicts
 
 [diff]