tests/test-rename-after-merge
changeset 5378 8a2915f57dfc
parent 5318 c6682cdada2f