tests/fish-merge
changeset 2564 55e592041076
parent 814 0902ffece4b4