changeset 391:0bccac92b6f1

Merge commit '6667bc4' into rhel5
author Edho Arief <edho@myconan.net>
date Thu, 26 Jul 2012 12:44:42 +0200
parents e5cf57bf6b47 (diff) e1f07d9d6937 (current diff)
children e0726df9196f
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rc/hgrc	Thu Jul 26 17:44:26 2012 +0700
+++ b/rc/hgrc	Thu Jul 26 12:44:42 2012 +0200
@@ -10,7 +10,7 @@
 
 [extensions]
 #hgext.convert = 
-progress =
+#progress =
 hgext.bookmarks =
 mq =
 rebase =