tests/test-rename-after-merge
changeset 11699 da0b9109186d
parent 7689 d821ea464465