tests/test-merge-commit
changeset 5388 557e4a916e12
parent 4361 46280c004f22