tests/fish-merge
changeset 1918 7f0899f7828c
parent 814 0902ffece4b4