tests/test-rename-merge1
changeset 3914 3c82ab166eea
parent 3853 c0b449154a90