t / t4252 / file-2-0on commit handle_delete_modify(): Check whether D/F conflicts are still present (84a08a4)
   11
   22
   33
   44
   55
   66
   77