Rev 4222: (vila) Clarify 'missing --include-merges' help. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4222
revision-id: pqm at pqm.ubuntu.com-20090331122525-77wqe7gqpr2gcl7u
parent: pqm at pqm.ubuntu.com-20090331100842-0x25r10mpiyxv5d9
parent: v.ladeuil+lp at free.fr-20090331113302-9snfk9ryx5k1kcqs
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-31 13:25:25 +0100
message:
  (vila) Clarify 'missing --include-merges' help.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 4221.1.1
    revision-id: v.ladeuil+lp at free.fr-20090331113302-9snfk9ryx5k1kcqs
    parent: pqm at pqm.ubuntu.com-20090331100842-0x25r10mpiyxv5d9
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: various
    timestamp: Tue 2009-03-31 13:33:02 +0200
    message:
      Clarify 'missing --include-merges' help.
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2009-03-31 00:28:19 +0000
+++ b/bzrlib/builtins.py	2009-03-31 11:33:02 +0000
@@ -3916,7 +3916,8 @@
             type=_parse_revision_str,
             help='Filter on local branch revisions (inclusive). '
                 'See "help revisionspec" for details.'),
-        Option('include-merges', 'Show merged revisions.'),
+        Option('include-merges',
+               'Show all revisions in addition to the mainline ones.'),
         ]
     encoding_type = 'replace'