tests/fish-merge
changeset 967 1f3710636b45
parent 814 0902ffece4b4