tests/test-rename-after-merge
changeset 5353 c6adf2be6069
parent 5318 c6682cdada2f