← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.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/test_status.py
114
114
        show_pending_merges(tree, output, verbose=True)
115
115
        self.assertEqualDiff('pending merges:\n'
116
116
                             '  Joe Foo 2007-12-04 another non-ghost\n'
117
 
                             '    Joe Foo 2007-12-04 commit with ghost\n'
 
117
                             '    Joe Foo 2007-12-04 [merge] commit with ghost\n'
118
118
                             '    (ghost) a-ghost-revision\n'
119
119
                             '    Joe Foo 2007-12-04 a non-ghost\n',
120
120
                             output.getvalue())