changeset 27:3b88a6c02421

update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
author Jeff Hammel <k0scist@gmail.com>
date Tue, 09 Mar 2010 12:08:18 -0500
parents 56d0cd1fefda
children 4c9248b9498e
files .hgrc
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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