Add a test for merging changed and rename-changed branches