← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_init.py
61
61
            out)
62
62
        self.assertEqual('', err)
63
63
        out, err = self.run_bzr('branches')
64
 
        self.assertEqual(" abranch\n", out)
 
64
        self.assertEqual("  abranch\n", out)
65
65
        self.assertEqual('', err)
66
66
 
67
67
    def test_init_at_repository_root(self):