tests/test-merge-commit
changeset 7761 1e70db1825d2
parent 4365 46280c004f22
child 8167 6c82beaaa11a