Set file encoding. Fix merge command. Added win32 enc/dec example.
--- a/.hgrc Sat Apr 24 21:51:53 2010 +0300
+++ b/.hgrc Sun Apr 25 22:16:19 2010 +0300
@@ -1,11 +1,34 @@
+; -*- mode: ini-generic; coding: utf-8 -*-
+
[ui]
username = Oleksandr Gavenko <gavenkoa@gmail.com>
-internal:merge =
+merge = internal:merge
+editor = emacs -q
[defaults]
log = -v
incoming = -v
outgoing = -v
+[web]
+encoding = utf-8
+
[extensions]
+; For old Mercurial.
+; fetch =
hgext.fetch =
+hgext.mq =
+; hgext.win32text =
+
+; [encode]
+; **.py = cleverencode:
+; **.c = cleverencode:
+; **.h = cleverencode:
+; **.java = cleverencode:
+; **.txt = cleverencode:
+; [decode]
+; **.py = cleverdecode:
+; **.c = cleverdecode:
+; **.h = cleverdecode:
+; **.java = cleverdecode:
+; **.txt = cleverdecode: