# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1239911775 18000
# Node ID b958738c16f34ee54169b430bd67887adf7ae395
# Parent  68f53fa09e99383588459df0d5face8409af03a4
Fix an oops in the .hgrc.

diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -14,10 +14,14 @@ hgext.rebase=
 hgext.record=
 hgext.transplant=
 # hgext.zeroconf=
-hgsubversion=/Stuff/hgsubversion
+hgsubversion=
 hggit=
 histedit=
 
+[merge-tools]
+filemerge.executable = opendiff-w
+filemerge.args = $local $other -ancestor $base -merge $output
+
 [alias]
 ll=log --graph -l 6