← 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: John Arbash Meinel
  • Date: 2007-05-08 20:10:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2503.
  • Revision ID: john@arbash-meinel.com-20070508201017-w968czcnrzvjttze
Add [merge] after the timestamp for revisions with merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
306
306
            show_log(wt.branch, formatter)
307
307
            logfile.flush()
308
308
            self.assertEqualDiff("""\
309
 
    2 Joe Foo\t2005-11-22
 
309
    2 Joe Foo\t2005-11-22 [merge]
310
310
      rev-2
311
311
 
312
312
    1 Joe Foo\t2005-11-22