tests/test-merge-commit
changeset 5324 7b4b874ce12c
parent 4361 46280c004f22