tests/test-merge-commit
changeset 4467 d189b19936ec
parent 4361 46280c004f22