tests/test-merge-commit
changeset 10350 fd511e9eeea6
parent 8523 5b7da468531b