tests/fish-merge
changeset 1002 254ab35709e6
parent 814 0902ffece4b4