← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_update.py

Tree Transform-based merger

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
91
91
        self.assertEqual(['1 conflicts encountered.',
92
92
                          'Updated to revision 2.'],
93
93
                         err.split('\n')[1:3])
94
 
        self.assertContainsRe(err, 'Diff3 conflict encountered in.*file\n')
 
94
        self.assertContainsRe(err, 'Text conflict in file\n')
95
95
        self.assertEqual('', out)