# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1189542292 25200
# Node ID ec061aaa25a44a3719c226ef4ae98ff96b80b87a
# Parent  51b132b4fd36bd48c341f75ac1c8b8ca30ecc2fa# Parent  c8efd19e248c1f9990a1b765720289715134677a
Merge with crew-stable

diff -r 51b132b4fd36 -r ec061aaa25a4 doc/hg.1.txt
--- a/doc/hg.1.txt	Mon Sep 10 15:00:19 2007 -0700
+++ b/doc/hg.1.txt	Tue Sep 11 13:24:52 2007 -0700
@@ -62,6 +62,14 @@
     The reserved name "tip" is a special tag that always identifies
     the most recent revision.
 
+    The reserved name "null" indicates the null revision. This is the
+    revision of an empty repository, and the parent of revision 0.
+
+    The reserved name "." indicates the working directory parent. If
+    no working directory is checked out, it is equivalent to null.
+    If an uncommitted merge is in progress, "." is the revision of
+    the first parent.
+
 SPECIFYING MULTIPLE REVISIONS
 -----------------------------