# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2009-04-10 11:06:02
# Node ID fd35e9d7287922d94746fd163fdc453e7c824439
# Parent  545fb915fe1672834bb569e54651d596258ad05b
# Parent  87c5a4af0b5a9ccac64624fd0c4c90f63f49b79a

Merge with crew-stable

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1991,7 +1991,7 @@ def manifest(ui, repo, node=None, rev=No
 
     Print a list of version controlled files for the given revision.
     If no revision is given, the first parent of the working directory
-    is used, or tip if no revision is checked out.
+    is used, or the null revision if none is checked out.
 
     With -v flag, print file permissions, symlink and executable bits.
     With --debug flag, print file revision hashes.