tests/test-rename-after-merge
changeset 10718 f18c37fd624f
parent 7689 d821ea464465