feat(broccoli): add diffing MergeTrees plugin

Closes #1815 Closes #2064
2015-05-21 12:07:52 -04:00
parent 41ae8e76f0
commit 4ee3fdaf7f
5 changed files with 136 additions and 3 deletions
--- a/tools/broccoli/trees/dart_tree.ts
+++ b/tools/broccoli/trees/dart_tree.ts
@ -6,7 +6,7 @@ import {MultiCopy} from './../multi_copy';
 import destCopy from '../broccoli-dest-copy';
 var Funnel = require('broccoli-funnel');
 var glob = require('glob');
-var mergeTrees = require('broccoli-merge-trees');
+import mergeTrees from '../broccoli-merge-trees';
 var path = require('path');
 var renderLodashTemplate = require('broccoli-lodash');
 var replace = require('broccoli-replace');