tests/test-rename-merge2
changeset 4714 a741293793f6
parent 4659 7a7d4937272b