Reorder merge test asserts for clarity
Describe conflict in test with arrows right way around
Order receiver/giver content in merge test comment
Test conflict gets written to working copy
Test conflicted merge still has MERGE_HEAD
Correct comment about when base written to index in conflict
Test can update-index for file repeatedly
Add index.readFileInConflict()
Add index.readConflictedPaths()
Add testUtil.createDeeplyNestedFileStructure()
update_index() can resolve conflicted files
Can now merge conflicts!
Todos done
Add todo: compose conflicts line by line