tests/test-merge-commit
changeset 10157 5d92fe90be84
parent 8523 5b7da468531b