~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

(mbp) merge bzr.dev to 0.8, prepare for release

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
                                  "Reconciliation complete.\n" %
61
61
                                  t.bzrdir.root_transport.base)
62
62
        self.assertEqualDiff(err, "")
63