tests/test-rename-after-merge
changeset 7786 92455c1d6f83
parent 7689 d821ea464465