tests/test-merge-commit.out
changeset 5527 0b3f910dfd17
parent 5371 17ed9b9a0d03
child 6004 5af5f0f9d724