# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1307120793 14400
# Node ID da23e486e9b14711489d5155a7b34f8245f42696
# Parent  90ce20bf3d8b802cc34a62f3e237523b00ea09e8
Add vimmerge.

diff -r 90ce20bf3d8b -r da23e486e9b1 .hgrc
--- a/.hgrc	Wed Jun 01 13:33:35 2011 -0400
+++ b/.hgrc	Fri Jun 03 13:06:33 2011 -0400
@@ -46,6 +46,7 @@
 dwd = ssh://hg@bitbucket.org/dwaiter/
 nyh = ssh://sjl@gotham.nyhacker.org/
 dl = ssh://hg@hg.dwaiter.com:38038/
+mirr = ssh://hg@dwaiter.com:38038/mirror/
 
 [diff]
 git = True
@@ -60,6 +61,10 @@
 opts.dd = 
 
 [merge-tools]
+vimmerge.executable = mvim
+vimmerge.args = -f $output -c 'Conflict2Diff'
+vimmerge.premerge = keep
+vimmerge.priority = 1
 
 [email]
 method = smtp