tests/test-merge-commit
changeset 5366 d0c48891dd4a
parent 4361 46280c004f22