tests/test-merge-commit
changeset 5397 11caa374f497
parent 4361 46280c004f22