# HG changeset patch # User Benoit Boissinot # Date 1130193465 25200 # Node ID db6d7b4005ba450ae1814601732324c4a5cfba09 # Parent 22b44fd9a166d6306abc16c4886e0ac3f1c50802 add --only-merges (-m) log diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1281,6 +1281,8 @@ def log(ui, repo, *pats, **opts): if p != nullid] if opts['no_merges'] and len(parents) == 2: continue + if opts['only_merges'] and len(parents) != 2: + continue br = None if opts['keyword']: @@ -1903,6 +1905,7 @@ table = { ('k', 'keyword', [], _('search for a keyword')), ('r', 'rev', [], _('revision')), ('M', 'no-merges', None, _("do not show merges")), + ('m', 'only-merges', None, _("show only merges")), ('p', 'patch', None, _('show patch'))], _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')), "manifest": (manifest, [], _('hg manifest [REV]')),