811
811
raw_conflicts = resolve_conflicts(tt)
812
812
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
815
815
self.assertEqual(len(cooked_conflicts), len(conflicts_s))
816
816
self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy. '
817
817
'Moved existing file to '