t6042: Add failing testcase for rename/modify/add-source conflict