tests/fish-merge
changeset 1845 cfe689ab3f06
parent 814 0902ffece4b4