test-rename-after-merge.t #1