tests/fish-merge
changeset 969 1d5b97537561
parent 814 0902ffece4b4