# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1417279925 -7200
# Node ID b911a74c6e5247c92a96c521d45af71be60cf806
# Parent  107b566e7a1254a126f2060e24ea1678a84b8d5b# Parent  54d48270964054e0048e0f65a6d8b1d75ae07f4c
up

diff -r 54d482709640 -r b911a74c6e52 hg.rst
--- a/hg.rst	Thu Nov 27 23:49:40 2014 +0200
+++ b/hg.rst	Sat Nov 29 18:52:05 2014 +0200
@@ -73,6 +73,14 @@
   ; Enable '.hgeol' tracking (fix for CR/LF).
   hgext.eol =
 
+Show diff against 2 parents or base during merge.
+=================================================
+::
+
+  hg diff -r 'p1()'
+  hg diff -r 'p2()'
+  hg diff -r 'ancestor(p1(), p2())'
+
 Downgrade repository format.
 ============================
 
@@ -131,7 +139,7 @@
 -----------------
 ::
 
-  $ hg conver --branchmap $branchmapfile oldrepo newrepo
+  $ hg convert --branchmap $branchmapfile oldrepo newrepo
 
 To convert non-ASCII names use UTF-8 coding for 'branchmap' file.
 
@@ -139,8 +147,8 @@
 separator between old branch name and new, so new branch name can not contain
 spaces.
 
-Join history of two repos.
-==========================
+Joining history of two repos.
+=============================
 ::
 
   $ cat >filemap1.txt <<EOF
@@ -242,12 +250,12 @@
 
   PORT=7878
   SRC=/srv/hg
-  CONGIG=/srv/hg/hgweb.config
+  CONFIG=/srv/hg/hgweb.config
   PIDFILE=/var/run/hg.pid
 
   case "$1" in
   start)
-    echo "Mecurial Server service starting."
+    echo "Mercurial Server service starting."
     (cd "$SRC"; $CMD serve -d -p $PORT --pid-file "$PIDFILE")
     ;;
   stop)
@@ -336,7 +344,7 @@
   $ hg qpop -a
   $ hg qdelete first.patch
 
-To add new version of source and fix patches for it first de apply patches,
+To add new version of source and fix patches for it first de-apply patches,
 then pull new changes and try apply patches on top of new sources::
 
   $ hg qpop -a
@@ -389,12 +397,6 @@
   $ hg clone --config http_proxy.host=$host:$port \
     --config http_proxy.user=$user --config http_proxy.passwd=$password  $addr
 
-Free Mercurial hosting.
-=======================
-
-  http://mercurial.selenic.com/wiki/MercurialHosting
-                Free Hosting of Mercurial Repositories
-
 Shelve/stash uncommitted changes.
 =================================
 
@@ -484,3 +486,9 @@
   .obj
   *.exe
 
+Free Mercurial hosting.
+=======================
+
+  http://mercurial.selenic.com/wiki/MercurialHosting
+                Free Hosting of Mercurial Repositories
+