tests/test-merge-commit
changeset 10839 31e29566f3b5
parent 8523 5b7da468531b