tests/test-rename-after-merge
changeset 10260 fe699ca08a45
parent 7689 d821ea464465