tests/test-merge-commit
changeset 4800 6aa1fae4c28a
parent 4361 46280c004f22