tests/test-merge-prompt
changeset 6930 a58a611c320f
parent 5672 8a65ea986755