tests/test-merge-commit
changeset 8222 d30a21594812
parent 8167 6c82beaaa11a
child 8523 5b7da468531b