# HG changeset patch # User Steve Losh # Date 1272740657 14400 # Node ID bc6875651950eb706e48a657e0fb240a48d71c58 # Parent c37b42fc84097f1ef149996462a68db2a305dab7# Parent 3a5a19f5dd1fa3a86cfd906e7ae2b32d92918084 Merge. diff -r 3a5a19f5dd1f -r bc6875651950 .hgrc --- 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