tests/fish-merge
changeset 1724 5a36609f73a7
parent 814 0902ffece4b4