# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1140462565 28800
# Node ID 47f4fbee32c55a6e8b9febd5a4a3ba69c131f3fd
# Parent  23012d48ae91786cfaf258c9f10ab72bd324bbed
add options to log man page.


diff -r 23012d48ae91 -r 47f4fbee32c5 doc/hg.1.txt
--- a/doc/hg.1.txt	Mon Feb 20 11:07:09 2006 -0800
+++ b/doc/hg.1.txt	Mon Feb 20 11:09:25 2006 -0800
@@ -376,7 +376,11 @@
     options:
     -I, --include <pat>   include names matching the given patterns
     -X, --exclude <pat>   exclude names matching the given patterns
+    -b, --branch          show branches
+    -k, --keyword <str>   search for keywords
     -l, --limit <num>     print no more than this many changes
+    -M, --no-merges       do not show merges
+    -m, --only-merges     only show merges
     -r, --rev <A>         show the specified revision or range
     -p, --patch           show patch