# HG changeset patch
# User Jeff Hammel <k0scist@gmail.com>
# Date 1268154498 18000
# Node ID 3b88a6c0242185803dfb77778ed1fc711d4b7f1d
# Parent  56d0cd1fefdac68378b8a6727c6bc6ec7df9201a
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ

diff -r 56d0cd1fefda -r 3b88a6c02421 .hgrc
--- a/.hgrc	Mon Mar 08 10:30:38 2010 -0500
+++ b/.hgrc	Tue Mar 09 12:08:18 2010 -0500
@@ -1,6 +1,15 @@
 [ui]
-username = k0s <k0scist@gmail.com>
+username = Jeff Hammel <k0scist@gmail.com>
 ignore = /home/jhammel/.hgignore
+merge = internal:merge
+
+[defaults]
+commit = -v
+
+[diff]
+git = 1
+showfunc = 1
+unified = 8
 
 [trusted]
 users = jhammel