tests/fish-merge
changeset 1329 8f06817bf266
parent 814 0902ffece4b4