Bump diff to 5.0.0

Author: mshima

lib/util/conflicter.js

@@ -236,13 +236,14 @@ class Conflicter {
         contents.toString(),
         this.diffOptions
       );
-    } else {
-      file.changes = jsdiff.diffLines(
-        actual.toString(),
-        contents.toString(),
-        this.diffOptions
-      );
+      const {changes} = file;
+      return changes.some(change => change.value && change.value.trim() && (change.added || change.removed));
     }
+    file.changes = jsdiff.diffLines(
+      actual.toString(),
+      contents.toString(),
+      this.diffOptions
+    );
 
     const {changes} = file;
     return changes.length > 1 || changes[0].added || changes[0].removed;

package-lock.json

@@ -46,7 +46,7 @@
     "cli-table": "^0.3.1",
     "dateformat": "^4.5.0",
     "debug": "^4.1.1",
-    "diff": "^4.0.2",
+    "diff": "^5.0.0",
     "escape-string-regexp": "^4.0.0",
     "execa": "^5.0.0",
     "globby": "^11.0.1",