t6031: Add a testcase covering multiple renames across a D/F conflict