← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_log.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-02-11 00:07:30 UTC
  • mfrom: (3998.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090211000730-hzn2dne4230w8vyv
Add merge indication to line format (Neil Martinsen-Burrell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
616
616
        log = normalize_log(out)
617
617
        # Not supported by this formatter so expect plain output
618
618
        self.assertEqualDiff(subst_dates(log), """\
619
 
2: Lorem Ipsum 2005-11-22 merge branch 1
 
619
2: Lorem Ipsum 2005-11-22 [merge] merge branch 1
620
620
1: Lorem Ipsum 2005-11-22 first post
621
621
""")
622
622