25fd2544de00
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Mon, 10 May 2010 18:19:44 -0400 |
parents | 1ca21077994c (current diff) bc6875651950 (diff) |
children | ac5a5af0afca |
branches/tags | (none) |
files |
Changes
--- a/.hgrc Mon May 10 18:19:20 2010 -0400 +++ b/.hgrc Mon May 10 18:19:44 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