tests/test-merge-commit
changeset 10107 c03f467423f3
parent 8523 5b7da468531b