[merge addon] Lazily initialize diff_match_patch

codemirror · Aug 24, 2017 · 91817cc · 91817cc
1 parent f611d27
commit 91817cc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
@@ -644,9 +644,10 @@
   }
 
   // Operations on diffs
-
-  var dmp = new diff_match_patch();
+  var dmp;
   function getDiff(a, b, ignoreWhitespace) {
+    if (!dmp) dmp = new diff_match_patch();
+
     var diff = dmp.diff_main(a, b);
     // The library sometimes leaves in empty parts, which confuse the algorithm
     for (var i = 0; i < diff.length; ++i) {