tests/test-merge-commit
changeset 8922 904916c8b8f1
parent 8523 5b7da468531b