handle_delete_modify(): Check whether D/F conflicts are still present
[git] / t / t5100 / msg0016
1 and some content
2