← Back to branch summary

~jameinel/bzr/2.2.0b2-pack-collection

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_merge.py

  • Committer: John Arbash Meinel
  • Date: 2010-04-19 18:42:35 UTC
  • mfrom: (5074.3.91 +trunk)
  • Revision ID: john@arbash-meinel.com-20100419184235-ke8p0r0esktvx1b9
Bring in bzr.dev @ 5165

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_merge.py
34
34
        cmd = cmd_merge()
35
35
        # We don't care about the ouput but 'outf' should be defined
36
36
        cmd.outf = StringIOWrapper()
37
 
        cmd.run_direct(self.get_url('branch1'), directory='branch2')
 
37
        cmd.run(self.get_url('branch1'), directory='branch2')
38
38
        self.assertEquals(1, len(self.connections))
39