# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1320264400 18000
# Node ID e4a17bb8472fe5903abf794fbf3e1a6e5734f783
# Parent  c1eb8398fe822af3c1eada34368fa5771f252b28
log: hide some low-utility options

diff -r c1eb8398fe82 -r e4a17bb8472f mercurial/commands.py
--- a/mercurial/commands.py	Wed Nov 02 13:51:16 2011 -0500
+++ b/mercurial/commands.py	Wed Nov 02 15:06:40 2011 -0500
@@ -3705,14 +3705,14 @@
     [('f', 'follow', None,
      _('follow changeset history, or file history across copies and renames')),
     ('', 'follow-first', None,
-     _('only follow the first parent of merge changesets')),
+     _('only follow the first parent of merge changesets (DEPRECATED)')),
     ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
     ('C', 'copies', None, _('show copied files')),
     ('k', 'keyword', [],
      _('do case-insensitive search for a given text'), _('TEXT')),
     ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
     ('', 'removed', None, _('include revisions where files were removed')),
-    ('m', 'only-merges', None, _('show only merges')),
+    ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
     ('u', 'user', [], _('revisions committed by user'), _('USER')),
     ('', 'only-branch', [],
      _('show only changesets within the given named branch (DEPRECATED)'),