tests/test-merge-commit.out
changeset 5388 557e4a916e12
parent 5371 17ed9b9a0d03