tests/test-rename-after-merge
changeset 11377 9916263d9a60
parent 7689 d821ea464465