tests/test-merge-commit.out
changeset 5407 d7e7902bb190
parent 5371 17ed9b9a0d03