tests/test-merge-commit
changeset 5260 0fc16031bb45
parent 4361 46280c004f22