← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-19 15:22:23 UTC
  • mfrom: (6123.11.18 log-omit-merges)
  • Revision ID: pqm@pqm.ubuntu.com-20110919152223-o7lh1428tge31dg1
(jr) Add options --omit-merges and --include-merged for bzr log and missing,
 deprecating --include-merges. (Martin von Gagern)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
323
323
    1 Joe Foo\t2005-11-22
324
324
      rev-1
325
325
 
326
 
Use --include-merges or -n0 to see merged revisions.
 
326
Use --include-merged or -n0 to see merged revisions.
327
327
""",
328
328
            wt.branch, log.ShortLogFormatter,
329
329
            formatter_kwargs=dict(show_advice=True))