d6318c673b61

--- a/.hgrc	Sun May 31 14:44:56 2009 -0400
+++ b/.hgrc	Mon Jun 01 19:47:44 2009 -0400
@@ -10,7 +10,6 @@
 hgext.purge = 
 hgext.mq = 
 hgext.patchbomb =
-parentrevspec = 
 color = 
 
 [diff]
@@ -37,8 +36,9 @@
 track.current = True
 
 [defaults]
-glog = -l7 --template 'changeset:   {rev}:{node|short} \033[35;40m{tags}\033[37;40m\nsummary:     {desc|firstline|fill68|tabindent|tabindent}\n\n'
+glog = -l7 --template 'changeset:   {rev}:{node|short} \033[33;40m{tags}\033[37;40m \033[35;40m{branches}\033[37;40m\nsummary:     {desc|firstline|fill68|tabindent|tabindent}\n\n'
 diff   = --color always
 status = --color always
 serve  = --style=gitweb
+rebase = --keepbranches
 addremove = --similarity 100