tests/test-merge-prompt
changeset 5796 7705d308eb5e
parent 5672 8a65ea986755