tests/test-merge-commit
changeset 8059 41a2c5cbcb6a
parent 4365 46280c004f22
child 8167 6c82beaaa11a