tests/test-merge-commit
changeset 4504 c68e6486f295
parent 4361 46280c004f22