tests/fish-merge
changeset 1821 0b3f4be5c5bf
parent 814 0902ffece4b4