diff -r 4726a522a182 -r aeb4a5c7a28e tests/test-help.out
--- a/tests/test-help.out	Wed Apr 08 20:51:09 2009 +0200
+++ b/tests/test-help.out	Wed Apr 08 21:20:31 2009 +0200
@@ -217,11 +217,11 @@
     revisions are specified, the working directory files are compared
     to its parent.
 
-    Without the -a option, diff will avoid generating diffs of files
-    it detects as binary. With -a, diff will generate a diff anyway,
-    probably with undesirable results.
+    Without the -a/--text option, diff will avoid generating diffs of
+    files it detects as binary. With -a, diff will generate a diff
+    anyway, probably with undesirable results.
 
-    Use the --git option to generate diffs in the git extended diff
+    Use the -g/--git option to generate diffs in the git extended diff
     format. For more information, read 'hg help diffs'.
 
 options:
@@ -248,9 +248,10 @@
 
     Show status of files in the repository. If names are given, only
     files that match are shown. Files that are clean or ignored or
-    source of a copy/move operation, are not listed unless -c (clean),
-    -i (ignored), -C (copies) or -A is given. Unless options described
-    with "show only ..." are given, the options -mardu are used.
+    source of a copy/move operation, are not listed unless -c/--clean,
+    -i/--ignored, -C/--copies or -A/--all is given. Unless options
+    described with "show only ..." are given, the options -mardu are
+    used.
 
     Option -q/--quiet hides untracked (unknown and ignored) files
     unless explicitly requested with -u/--unknown or -i/--ignored.