tests/test-rename-after-merge
changeset 5365 ac2ccdcf4539
parent 5318 c6682cdada2f
child 5608 784eadabd985