Conflicter to handle null file.contents - Fix #950

yeoman · Nov 26, 2016 · 687b9be · 687b9be
1 parent d6345f7
commit 687b9be
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/util/conflicter.js b/lib/util/conflicter.js
@@ -181,7 +181,7 @@ Conflicter.prototype._ask = function (file, cb) {
         this.adapter.log.writeln(binaryDiff.diff(file.path, file.contents));
       } else {
         var existing = fs.readFileSync(file.path);
-        this.adapter.diff(existing.toString(), file.contents.toString());
+        this.adapter.diff(existing.toString(), (file.contents || '').toString());
       }
 
       return this._ask(file, cb);