tests/test-merge-commit
changeset 8518 3f4f14eab085
parent 8167 6c82beaaa11a
child 8523 5b7da468531b