tests/test-merge-commit.out
changeset 5379 d3e51dc804f8
parent 5371 17ed9b9a0d03