t / test4012.pngon commit handle_delete_modify(): Check whether D/F conflicts are still present (84a08a4)
t/test4012.png