tests/test-merge-commit
changeset 4875 97dbf330069a
parent 4365 46280c004f22
child 8167 6c82beaaa11a