t6022: Add tests for rename/rename combined with D/F conflicts