tests/test-merge-commit
changeset 11995 ff84cd2bdfaf
parent 8523 5b7da468531b