tests/fish-merge
changeset 1620 6c61646fee5e
parent 814 0902ffece4b4