tests/test-merge-commit
changeset 4527 b422b558015b
parent 4361 46280c004f22