tests/test-merge-commit
changeset 6608 8d9d09d7c8b7
parent 4365 46280c004f22
child 8167 6c82beaaa11a