3c7807c230c3
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Thu, 22 Sep 2011 20:52:14 -0400 | 
| parents | 5a201c5b2f53 (current diff) d35188ee2a88 (diff) | 
| children | b811396371c8 | 
| branches/tags | (none) | 
| files | 
Changes
--- a/.hgrc Thu Sep 22 20:51:44 2011 -0400 +++ b/.hgrc Thu Sep 22 20:52:14 2011 -0400 @@ -20,12 +20,10 @@ progress = fetch = hgsubversion = ~/lib/hg/hgsubversion/hgsubversion -paste = ~/lib/hg/hg-paste/paste.py prompt = ~/lib/hg/hg-prompt/prompt.py histedit = ~/lib/hg/histedit/hg_histedit.py hggit = ~/lib/hg/hg-git/hggit collapse = ~/lib/hg/hgcollapse/hgext/collapse.py -review = ~/src/hg-review/review [progress] delay = 1.0