tests/test-merge-commit
changeset 8673 a8066f2fd1aa
parent 8523 5b7da468531b