# HG changeset patch # User Steve Losh # Date 1316739134 14400 # Node ID 3c7807c230c399082b42195733f5e948e19bd5c1 # Parent 5a201c5b2f530f6ab15241e81d97675fe4eb237f# Parent d35188ee2a884db7e90ce34a669501b148ebf9bb Merge. diff -r 5a201c5b2f53 -r 3c7807c230c3 .hgrc --- 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