# HG changeset patch
# User bos@eng-25.internal.keyresearch.com
# Date 1124919962 25200
# Node ID 5f191561a061ff95359e8cca7d1e9d2ee6b3952a
# Parent  c0a1abf562eba418b3d8cdfc2f8dc3caec6951cc# Parent  7c00f5f2c967ca56300bab80eb2ab6cce9ac924f
Merge with MPM.



diff -r c0a1abf562eb -r 5f191561a061 doc/hg.1.txt
--- a/doc/hg.1.txt	Wed Aug 24 14:45:35 2005 -0700
+++ b/doc/hg.1.txt	Wed Aug 24 14:46:02 2005 -0700
@@ -252,8 +252,8 @@
     -r, --rev <rev>      search the repository as it stood at rev
     -X, --exclude <pat>  exclude names matching the given patterns
 
-log [-r revision ...] [-p] [file]::
-    Print the revision history of the specified file or the entire project.
+log [-r revision ...] [-p] [files]::
+    Print the revision history of the specified files or the entire project.
 
     By default this command outputs: changeset id and hash, tags,
     parents, user, date and time, and a summary for each commit. The
@@ -261,12 +261,10 @@
     hashes or message signatures.
 
     options:
-    -r, --rev <A>, ...  When a revision argument is given, only this file or
-                        changelog revision is displayed. With two revision
-                        arguments all revisions in this range are listed.
-                        Additional revision arguments may be given repeating
-                        the above cycle.
-    -p, --patch         show patch
+    -I, --include <pat>   include names matching the given patterns
+    -X, --exclude <pat>   exclude names matching the given patterns
+    -r, --rev <A>         show the specified revision or range
+    -p, --patch           show patch
 
     aliases: history