tests/test-merge-commit
changeset 9780 1ee085511b89
parent 8523 5b7da468531b