From 94b4cf24049f0f76cd0a6473da29b0f54775197e Mon Sep 17 00:00:00 2001
From: Toilal <toilal.dev@gmail.com>
Date: Fri, 16 Jan 2015 10:29:48 +0100
Subject: [PATCH] Fix conflicter by giving a buffer to detect-conflict

detect-conflict dependency handles buffers properly, so this toString() call is not required anymore and cause false positive on conflicter.

Close #717
---
 lib/base.js            | 2 +-
 lib/util/conflicter.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/base.js b/lib/base.js
index 8831d660..692e36ee 100644
--- a/lib/base.js
+++ b/lib/base.js
@@ -760,7 +760,7 @@ Base.prototype._writeFiles = function (done) {
       return cb();
     }
 
-    self.conflicter.checkForCollision(file.path, file.contents.toString(), function (err, status) {
+    self.conflicter.checkForCollision(file.path, file.contents, function (err, status) {
       if (err) return cb(err);
       if (status !== 'skip') {
         stream.push(file);
diff --git a/lib/util/conflicter.js b/lib/util/conflicter.js
index 0ba65b45..5203c89c 100644
--- a/lib/util/conflicter.js
+++ b/lib/util/conflicter.js
@@ -165,7 +165,7 @@ Conflicter.prototype._ask = function (file, cb) {
     }
 
     if (result.action === 'diff') {
-      this.adapter.diff(fs.readFileSync(file.path, 'utf8'), file.contents);
+      this.adapter.diff(fs.readFileSync(file.path, 'utf8'), file.contents.toString());
       return this._ask(file, cb);
     }