diff hg @ 102:7a287a518718

Merge.
author Edho Prima Arief <edho@myconan.net>
date Thu, 18 Aug 2011 15:20:54 +0700
parents e17886c8da43
children ed3d1b8e6f45
line wrap: on
line diff
--- a/hg	Thu Aug 18 15:15:06 2011 +0700
+++ b/hg	Thu Aug 18 15:20:54 2011 +0700
@@ -1,5 +1,5 @@
 [ui]
-username = Edho Prima Arief <me@myconan.net>
+username = Edho Prima Arief <edho@myconan.net>
 merge = vimdiff
 verbose = true