tests/fish-merge
changeset 1105 a906b018eaef
parent 814 0902ffece4b4