Fix conflicter by removing toString() call

[Toilal]

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

Close #717

[coveralls]

Coverage remained the same when pulling 56484b8 on Toilal:fix/conflicter-717 into 0f1bfa9 on yeoman:master.

[zckrs]

👍 fix

[kevva]

How does the diff look like?

[Toilal]

It just removes a toString() call from file.content buffer before giving it to conflicter ...

[kevva]

Yeah, I know, but I'm wondering how the diff looks like when diffing two files with the conflicter if one is a buffer.

[Toilal]

@kevva sorry, i thought you could not read the diff in github for some reason :)

In fact it's a good question, because displaying the diff produce an exception ! I'll fix too ...

/home/toilal/.npm/lib/node_modules/yo/node_modules/yeoman-environment/node_modules/inquirer/node_modules/rx/dist/rx.all.js:9229
        throw e;
              ^
TypeError: Object PK��

[Toilal]

Adding .toString() before calling diff fix the exception. I've check in 0.17.x and diff fails on binary files too.

https://github.com/yeoman/generator/blob/master/lib/util/conflicter.js#L168

That beeing said, does it really make sense to display a diff on binary files ? Maybe we could check if file is binary with istextorbinary, and use a different diff tool for those kind of files if it's revelant ?

[coveralls]

Coverage remained the same when pulling 94b4cf2 on Toilal:fix/conflicter-717 into 0f1bfa9 on yeoman:master.

[sindresorhus]

and use a different diff tool for those kind of files if it's revelant ?

Yes, for binary file we should show file size difference and modified/created time difference.

[Toilal]

Would you like the implementation to be part of this PR ?

[sindresorhus]

@Toilal Nah, separate PR.

[SBoudrias]

Let's follow up with a separate PR fixing diffing for binary file.

Thanks for digging into this!