Automated merge with file:///e:\srv\hg\admin-doc
authorOleksandr Gavenko <gavenkoa@gmail.com>
Sat, 27 Feb 2010 00:01:01 +0200
changeset 314 ae0b44392cd3
parent 309 117fd10347ec (current diff)
parent 313 7cc6dcfa284e (diff)
child 315 dd4cb03b6b46
Automated merge with file:///e:\srv\hg\admin-doc
--- 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: