# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1267725066 -7200
# Node ID 92affd306ff5cccfdb8de5849b4b567c63b27ec4
# Parent  5a839a273056e0ae455e9c26c5643890a00d50f5# Parent  dd4cb03b6b46fcf49ac0fb62b712150df149ae07
merged

diff -r 5a839a273056 -r 92affd306ff5 hg.rst
--- a/hg.rst	Thu Feb 25 10:39:23 2010 +0200
+++ b/hg.rst	Thu Mar 04 19:51:06 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:
diff -r 5a839a273056 -r 92affd306ff5 windows.rst
--- a/windows.rst	Thu Feb 25 10:39:23 2010 +0200
+++ b/windows.rst	Thu Mar 04 19:51:06 2010 +0200
@@ -1,5 +1,20 @@
 -*- outline -*-
 
+* Determining windows version.
+
+Run winver.exe: <Win> + R winver <RET>.
+
+Or type: <Win> + <Break>.
+
+Under cmd.exe use built-in command ver.
+
+For Win 2000 and upper check registry key:
+
+  cmd> reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v CurrentVersion
+
+To check 32/64-bit OS use PROCESSOR_ARCHITECTURE env var (it has such values:
+x86, AMD64, IA64).
+
 * XP.
 
 ** Check system files integrity.