tests/test-merge-commit
changeset 7964 4946ecb3c6fa
parent 4365 46280c004f22
child 8167 6c82beaaa11a