t / t5100 / patch0008on commit t1404: add a bunch of tests of D/F conflicts (2e9de01)
   1