t / t5100 / msg0009on commit t1404: add a bunch of tests of D/F conflicts (2e9de01)
   1This is to fix diff-format documentation.
   2