--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hg/.hgrc	Tue Jun 04 19:24:08 2013 -0500
@@ -0,0 +1,27 @@
+[ui]
+username = Brian Neal <bgneal@gmail.com>
+editor = vim
+ssh = ssh -C
+merge = kdiff3
+
+[extensions]
+color =
+graphlog =
+hgext.extdiff =
+hgext.convert =
+pager =
+progress =
+
+[extdiff]
+cmd.kdiff3 =
+
+[merge-tools]
+kdiff3.args =--L1 base --L2 local --L3 other $base $local $other -o $output
+
+[convert]
+svn.trunk = madeira/trunk
+svn.branches = madeira/branches
+svn.tags = madeira/tags
+
+[pager]
+pager = LESS='FRX' less