← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2007-10-10 00:21:57 UTC
  • mfrom: (2900 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2901.
  • Revision ID: mbp@sourcefrog.net-20071010002157-utci0x44m2w47wgd
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_merge.py
29
29
        wt2.pull(wt1.branch)
30
30
        wt2.commit('empty commit too')
31
31
 
32
 
        self.install_hooks()
 
32
        self.start_logging_connections()
33
33
 
34
34
        cmd = cmd_merge()
35
35
        # We don't care about the ouput but 'outf' should be defined