# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1267221661 -7200
# Node ID ae0b44392cd3a7641f1ecfaea909cda5a430ebee
# Parent  117fd10347ec54ee6bce5664e15bc939edab7762# Parent  7cc6dcfa284efdc1f10117878b98e9f621b198fc
Automated merge with file:///e:\srv\hg\admin-doc

diff -r 117fd10347ec -r ae0b44392cd3 hg.rst
--- a/hg.rst	Wed Feb 24 00:10:20 2010 +0200
+++ b/hg.rst	Sat Feb 27 00:01:01 2010 +0200
@@ -1,5 +1,55 @@
 -*- mode: outline; coding: utf-8 -*-
 
+* 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:
+
+  [extensions]
+  ; To allow fetch command.
+  fetch =
+  ; To allow Mercurial Queues.
+  hgext.mq =
+
+** Multiline log message for log command.
+
+By default 'hg log' show only first line of log message. To see all message run:
+
+  $ hg log -v
+
+or put into ~/.hgrc:
+
+  [defaults]
+  log = -v
+
+** Follow history ever when file copied.
+
+By default 'hg log' show only history after last file copy. To see log message
+before copying run:
+
+  $ hg log -f
+
+or put into ~/.hgrc:
+
+  [defaults]
+  log = -f
+
 * Manage patches with MQ.
 
 First enable MQ, add following to your ~/.hgrc: