← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge3.py

  • Committer: Martin Pool
  • Date: 2005-08-30 03:10:32 UTC
  • Revision ID: mbp@sourcefrog.net-20050830031032-92ae5f0abb866ab8
- remove dead code and remove some small errors (pychecker)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
221
221
                            start_marker='<<',
222
222
                            mid_marker='--',
223
223
                            end_marker='>>')
224
 
        self.assertEquals(''.join(m3.merge_lines()),
225
 
                          'aaa\n222\nbbb\n')
 
224
        self.assertEquals(''.join(ml), 'aaa\n222\nbbb\n')
 
225
        
226
226
 
227
227
    def test_insert_clash(self):
228
228
        """Both try to insert lines in the same place."""