tests/test-rename-after-merge
changeset 8436 62b9cf446cbf
parent 7689 d821ea464465