tests/test-rename-after-merge
changeset 5388 557e4a916e12
parent 5318 c6682cdada2f