tests/test-merge-commit
changeset 5407 d7e7902bb190
parent 4361 46280c004f22