tests/test-merge-commit
changeset 5247 90919a6f5c8f
parent 4361 46280c004f22