# HG changeset patch
# User Jeff Hammel <k0scist@gmail.com>
# Date 1269962569 25200
# Node ID 82d24a65cb0dc9087c4c1ba98eb4c7a9d9ade120
# Parent  bd91a6bc85cdd885abf4cbb76c09ecf79b73fcd3
use meld as merge program

diff -r bd91a6bc85cd -r 82d24a65cb0d .hgrc
--- a/.hgrc	Mon Mar 29 12:09:32 2010 -0700
+++ b/.hgrc	Tue Mar 30 08:22:49 2010 -0700
@@ -1,7 +1,7 @@
 [ui]
 username = Jeff Hammel <k0scist@gmail.com>
 ignore = /home/jhammel/.hgignore
-merge = internal:merge
+merge = meld
 
 [defaults]
 commit = -v