← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

  • Committer: Aaron Bentley
  • Date: 2005-07-15 13:13:40 UTC
  • mto: This revision was merged to the branch mainline in revision 923.
  • Revision ID: abentley@panoramicfeedback.com-20050715131340-c2ff3983303bf438
Fixed conflict handling for missing merge targets

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/versioning.py
64
64
                          b.add,
65
65
                          'foo/hello')
66
66
        
 
67
 
 
68
 
 
69
TEST_CLASSES = [
 
70
    Mkdir,
 
71
    AddInUnversioned,
 
72
    ]