# HG changeset patch # User Steve Losh # Date 1273529984 14400 # Node ID 25fd2544de00c294ffc6ae18fbab83fa73ac5368 # Parent 1ca21077994c1942774d5536ed328bbd7527bc65# Parent bc6875651950eb706e48a657e0fb240a48d71c58 Merge. diff -r 1ca21077994c -r 25fd2544de00 .hgrc --- 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