Update fs-tree-diff

[hjdivad]

• change merge-trees to correct version after Update fs-tree-diff broccolijs/broccoli-merge-trees#45 is merged

cc @stefanpenner

[stefanpenner]

@ef4 looks like appveyor and npm are having issues, I am unable to issue a rebuild (on appveyor) but i suspect this is good as is. Would love a +1

[ef4]

restarted appveyor...

[asakusuma]

looks like there's still an npm issue

npm ERR! notarget No compatible version found: broccoli-merge-trees@'>=1.1.2 <2.0.0'
npm ERR! notarget Valid install targets:
npm ERR! notarget ["0.1.3","0.1.4","0.2.0","0.2.1","0.2.2","0.2.3","0.2.4","1.0.0","1.1.0","1.1.1"]

[stefanpenner]

@asakusuma ya, I think appveyors cache (or npm mirror maybe) are out of sync..

[stefanpenner]

appveyor again couldn't find 1.1.2 but its totally on npm

npm info --json broccoli-merge-trees | jq '.version'          (4) (2s 791ms)
"1.1.2"

investigating cache stuff now..

[stefanpenner]

appveyor just seems borked