diff doc/hg.1.txt @ 1779:a1e6e02e9d05

Merge with mpm
author Josef "Jeff" Sipek <jeffpc@optonline.net>
date Sat, 18 Feb 2006 22:24:42 -0500
parents 251729df9cc6
children f95654385065
line wrap: on
line diff
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -223,9 +223,11 @@ diff [-a] [-r revision] [-r revision] [f
     probably with undesirable results.
 
     options:
-    -a, --text           treat all files as text
-    -I, --include <pat>  include names matching the given patterns
-    -X, --exclude <pat>  exclude names matching the given patterns
+    -a, --text              treat all files as text
+    -I, --include <pat>     include names matching the given patterns
+    -p, --show-function     show which function each change is in
+    -X, --exclude <pat>     exclude names matching the given patterns
+    -w, --ignore-all-space  ignore white space when comparing lines
 
 export [-o filespec] [revision] ...::
     Print the changeset header and diffs for one or more revisions.
@@ -600,9 +602,12 @@ tags::
 
     This lists both regular and local tags.
 
-tip::
+tip [-p]::
     Show the tip revision.
 
+    options:
+    -p, --patch      show patch
+
 unbundle <file>::
     (EXPERIMENTAL)