# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1402852094 14400
# Node ID 5cc55bc23c8a4968712a96aee13a5a2018d03185
# Parent  403d6acca6bb3ef1f1465f8515415a1e9ab04b3c
Use a more manageable vimdiff

diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -1,5 +1,6 @@
 [ui]
 username = Meredith Howard <mhoward@roomag.org>
+merge = vimdiff
 
 [extensions]
 hgext.graphlog = 
@@ -17,4 +18,9 @@ pager = LESS='FSRX' less
 [alias]
 fetch = pull --rebase
 
+[merge-tools]
+vimdiff.executable = vim
+vimdiff.args = -d $base $local $output $other +close +close
+
+
 %include ~/.hgrc.local