tests/test-rename-after-merge
changeset 9321 d7b6429c5ad4
parent 7689 d821ea464465