tests/test-merge-commit
changeset 4983 4dbcfc6e359e
parent 4365 46280c004f22
child 8167 6c82beaaa11a