tests/test-merge-commit
changeset 4524 6c58139f4eaa
parent 4361 46280c004f22