diff .hgrc @ 90:9f4b375f5d8e

Merge.
author Augie Fackler <durin42@gmail.com>
date Mon, 20 Apr 2009 20:33:45 -0500
parents b958738c16f3
children 9d09939f1100
line wrap: on
line diff
--- 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