t / t5100 / msg0007on commit t1404: add a bunch of tests of D/F conflicts (2e9de01)
   1Here is an empty patch from A U Thor.
   2