/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Spurious debug statement deleted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
79
79
        wt1.add('bar')
80
80
        wt1.commit('add foobar')
81
81
        os.chdir('branch2')
82
 
        import pdb; pdb.set_trace()
83
82
        self.run_bzr('merge ../branch1/baz', retcode=3)
84
83
        self.run_bzr('merge ../branch1/foo')
85
84
        self.failUnlessExists('foo')