changeset 394:e0726df9196f

Merge branch 'master' into rhel5
author Edho Arief <edho@myconan.net>
date Wed, 01 Aug 2012 15:28:42 +0700
parents 0bccac92b6f1 (diff) 0aabb2b34ef6 (current diff)
children 06e1821eacf5
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rc/hgrc	Wed Aug 01 15:17:56 2012 +0700
+++ b/rc/hgrc	Wed Aug 01 15:28:42 2012 +0700
@@ -10,7 +10,7 @@
 
 [extensions]
 #hgext.convert = 
-progress =
+#progress =
 hgext.bookmarks =
 mq =
 rebase =