# HG changeset patch
# User Edho Prima Arief <me@myconan.net>
# Date 1301225543 0
# Node ID a914a2168196e8e3d3f7edf0ded6584260e6ff34
# Parent  330587be514c7c08200c819ccee00410dc85316e
Merge, removed git support.

diff -r 330587be514c -r a914a2168196 hg
--- a/hg	Sun Mar 27 11:32:08 2011 +0000
+++ b/hg	Sun Mar 27 11:32:23 2011 +0000
@@ -1,6 +1,7 @@
 [ui]
 username = Edho Prima Arief <me@myconan.net>
 merge = vimdiff
+verbose = true
 
 [merge-tools]
 vimdiff.executable = vim
@@ -8,7 +9,4 @@
 
 [extensions]
 hgext.convert = 
-hgext.bookmarks =
-hgext.rebase =
-hggit =
-
+progress =