tests/test-merge-commit
changeset 11602 ba2520dd1e29
parent 8523 5b7da468531b