tests/test-merge-commit
changeset 7104 9514cbb6e4f6
parent 4365 46280c004f22
child 8167 6c82beaaa11a