t / t5100 / msg0016on commit t1404: add a bunch of tests of D/F conflicts (2e9de01)
   1and some content
   2