tests/test-rename-after-merge
changeset 9640 9e76232fbfbe
parent 7689 d821ea464465