281
281
builder.add_file("1", "TREE_ROOT", "name1", "text1", True)
282
282
builder.change_contents("1", other="text4", this="text3")
283
builder.add_file("2", "TREE_ROOT", "name2", "text1", True)
283
285
conflicts = builder.merge(merge_factory)
286
self.assertEqual(conflicts, [TextConflict('name1', file_id='1'),
287
291
def test_symlink_conflicts(self):