tests/test-merge-commit
changeset 5393 c2ad1890fc53
parent 4365 46280c004f22
child 8167 6c82beaaa11a