tests/test-rename-after-merge
changeset 7642 84346894def8
parent 5608 784eadabd985
child 7689 d821ea464465