--- a/.hgrc Sat Apr 24 21:44:38 2010 +0300 +++ b/.hgrc Sat Apr 24 21:51:21 2010 +0300 @@ -1,3 +1,7 @@ +[ui] +username = Oleksandr Gavenko <gavenkoa@gmail.com> +internal:merge = + [defaults] log = -v incoming = -v