tests/test-rename-after-merge
changeset 5379 d3e51dc804f8
parent 5318 c6682cdada2f