tests/test-merge-commit
changeset 8229 ddf3d6656e7c
parent 8167 6c82beaaa11a
child 8523 5b7da468531b