tests/test-merge-commit
changeset 5088 7e2385a31933
parent 4361 46280c004f22