t / t4252 / file-2-0on commit t6036: tests for criss-cross merges with various directory/file conflicts (827f2b7)
   11
   22
   33
   44
   55
   66
   77