t6022: Add testcase for merging a renamed file with a simple change