112f453a6f84

--- a/.hgrc	Thu Mar 18 15:45:28 2010 -0400
+++ b/.hgrc	Thu Apr 08 10:13:34 2010 -0400
@@ -14,6 +14,7 @@
 color = 
 parentrevspec =
 schemes = 
+progress =
 hgshelve = ~/lib/hg/hgshelve/hgshelve.py
 paste = ~/lib/hg/hg-paste/paste.py
 prompt = ~/lib/hg/hg-prompt/prompt.py
@@ -22,6 +23,9 @@
 collapse = ~/lib/hg/hgcollapse/hgext/collapse.py
 review = ~/lib/hg/hg-review/review
 
+[progress]
+delay = 1.0
+
 [schemes]
 webf = ssh://sjl@sjl.webfactional.com/repos/
 bbs = ssh://hg@bitbucket.org/
@@ -88,6 +92,7 @@
 cm = commit -m
 cus = commit -m 'Update subrepository state.'
 cuf = commit -m 'Update fixtures.' -I '**fixtures**.json'
+cmwn = commit -m 'Merge with Nick.'
 
 #mlocal = merge --config 'ui.merge=internal:local'
 #mother = merge --config 'ui.merge=internal:other'