tests/test-merge-commit
changeset 5365 458acf92b49e
parent 4361 46280c004f22