tests/test-merge-commit
changeset 11338 285bcf40e04b
parent 8523 5b7da468531b