Merge pull request prose#1025 from prose/1023-difflines

Diff on lines, rather than words
hponiang · Apr 24, 2017 · 140508b · 140508b
2 parents 0f18425 + 463d2a3
commit 140508b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/file.js b/app/views/file.js
@@ -928,7 +928,7 @@ module.exports = Backbone.View.extend({
     var text1 = this.model.isNew() ? '' : _.escape(this.model.get('previous'));
     var text2 = _.escape(this.model.serialize());
 
-    var d = diff.diffWords(text1, text2);
+    var d = diff.diffLines(text1, text2);
     var length = d.length;
     var compare = '';
 

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "chrono": "~1.0.4",
     "codemirror": "^5.13.2",
     "deepmerge": "~0.2.7",
-    "diff": "~1.0.4",
+    "diff": "~2.2.0",
     "handsontable": "git://github.com/handsontable/handsontable.git#0.20.2",
     "ignore": "~2.2.7",
     "jquery-browserify": "~1.8.1",