tests/test-merge-commit
changeset 9244 3f52a70959ce
parent 8523 5b7da468531b