tests/fish-merge
changeset 2810 2e4ace008c94
parent 814 0902ffece4b4