t / t5100 / msg0016on commit t6042: Add tests for content issues with modify/rename/directory conflicts (ac6e839)
   1and some content
   2