tests/test-rename-after-merge
changeset 9372 2484868cffde
parent 7689 d821ea464465