t / t5100 / msg0016on commit t6022: Add tests for rename/rename combined with D/F conflicts (7079834)
   1and some content
   2