← 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-07-06 04:20:14 UTC
  • Revision ID: mbp@sourcefrog.net-20050706042014-fd5067865d8ff5a1
- delay import of subprocess module until it's needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
342
342
        self.log('merge result:')
343
343
        self.log(''.join(ml))
344
344
        self.assertEquals(ml, MERGED_RESULT)
345
 
 
346
 
 
347
 
 
348
 
TEST_CLASSES = [
349
 
    NoChanges,
350
 
    FrontInsert,
351
 
    NullInsert,
352
 
    NoConflicts,
353
 
    AppendA,
354
 
    AppendB,
355
 
    AppendAgreement,
356
 
    AppendClash,
357
 
    InsertAgreement,
358
 
    InsertClash,
359
 
    ReplaceClash,
360
 
    ReplaceMulti,
361
 
    MergePoem,
362
 
    ]