tests/test-merge-commit
changeset 4911 fc502517d68d
parent 4361 46280c004f22