tests/test-merge-commit
changeset 4828 496ac05c6a31
parent 4361 46280c004f22