tests/test-merge-commit
changeset 8883 ede2247e61aa
parent 8523 5b7da468531b