~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Aaron Bentley
  • Date: 2007-12-28 21:45:18 UTC
  • mto: (3144.5.2 specific-file)
  • mto: This revision was merged to the branch mainline in revision 3156.
  • Revision ID: abentley@panoramicfeedback.com-20071228214518-kbzpqoco171k1jdu
Update test for new conflicted types

Show diffs side-by-side

added added

removed removed

Lines of Context:
509
509
        self.assertEqual([('unchanged', 'a\n'),
510
510
                          ('unchanged', 'b\n'),
511
511
                          ('unchanged', 'c\n'),
512
 
                          ('new-a', 'd\n'),
513
 
                          ('killed-b', 'd\n'),
514
 
                          ('new-b', 'e\n'),
515
 
                          ('killed-a', 'e\n'),
 
512
                          ('conflicted-a', 'd\n'),
 
513
                          ('conflicted-b', 'e\n'),
516
514
                         ], list(plan))