tests/test-merge-commit
changeset 8292 29540554def8
parent 8167 6c82beaaa11a
child 8523 5b7da468531b