--- a/hg.rst Fri Feb 26 23:48:11 2010 +0200
+++ b/hg.rst Fri Feb 26 23:54:32 2010 +0200
@@ -2,6 +2,21 @@
* Useful customization.
+Put to your ~/.hgrc:
+
+ [ui]
+ ; Editor for editing commit message.
+ editor = gvim
+ ; Who commit.
+ username = Oleksandr Gavenko <gavenkoa@gmail.com>
+ ; Use internal merge algorithm, which mark conflict like <<<<<< ====== >>>>>>.
+ ; Save previous file version in '*.orig' file, after merge must be marked as
+ ; resolved by running 'hg resolve -m <file>'.
+ merge = internal:merge
+ [web]
+ ; Default encoding for file hosted by 'hg serv'.
+ encoding = utf-8
+
** Useful extension.
Put to your ~/.hgrc: