t / t4252 / file-1-0on commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   11
   22
   33
   44
   55
   66
   77