changeset 401:06e1821eacf5

Merge remote-tracking branch 'origin/master' into rhel5
author Edho Arief <edho@myconan.net>
date Tue, 04 Sep 2012 09:30:40 +0700
parents e0726df9196f (diff) 657f787fbae8 (current diff)
children a23b0f6ee8a2
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rc/hgrc	Tue Sep 04 10:23:37 2012 +0700
+++ b/rc/hgrc	Tue Sep 04 09:30:40 2012 +0700
@@ -10,7 +10,7 @@
 
 [extensions]
 #hgext.convert = 
-progress =
+#progress =
 hgext.bookmarks =
 mq =
 rebase =