← 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-25 09:17:19 UTC
  • Revision ID: mbp@sourcefrog.net-20050825091719-b2d7be7bf56bb35a
- fix a few errors in new merge code

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
300
300
        self.log('merge result:')
301
301
        self.log(''.join(ml))
302
302
        self.assertEquals(ml, MERGED_RESULT)
 
303
 
 
304
 
 
305
TEST_CLASSES = [ TestMerge3 ]