t6042: Add tests for content issues with modify/rename/directory conflicts