bc6875651950
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Sat, 01 May 2010 15:04:17 -0400 |
parents | c37b42fc8409 (diff) 3a5a19f5dd1f (current diff) |
children | 25fd2544de00 |
branches/tags | (none) |
files |
Changes
--- a/.hgrc Fri Apr 30 15:28:32 2010 -0400 +++ b/.hgrc Sat May 01 15:04:17 2010 -0400 @@ -15,13 +15,11 @@ parentrevspec = schemes = progress = -hgshelve = ~/lib/hg/hgshelve/hgshelve.py paste = ~/lib/hg/hg-paste/paste.py prompt = ~/lib/hg/hg-prompt/prompt.py histedit = ~/lib/hg/histedit hggit = ~/lib/hg/hg-git/hggit collapse = ~/lib/hg/hgcollapse/hgext/collapse.py -review = ~/lib/hg/hg-review/review [progress] delay = 1.0