tests/fish-merge
changeset 1614 0952d164030e
parent 814 0902ffece4b4