/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-02-05 20:03:29 UTC
  • mto: (3998.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3999.
  • Revision ID: nmb@wartburg.edu-20090205200329-bhneu8nhzhdgv0m0
add merge indication to the line format

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