tests/test-merge-commit.out
changeset 5378 8a2915f57dfc
parent 5371 17ed9b9a0d03