t / test9200a.pngon commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
t/test9200a.png