tests/test-merge-commit
changeset 4439 871ff96a86cc
parent 4361 46280c004f22