tests/test-merge-commit
changeset 5444 a0952e4e52eb
parent 4361 46280c004f22