The unified diff between revisions [869f0c37..] and [e24ccc23..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'diff_patch.cc'

#
#
# patch "diff_patch.cc"
#  from [cb8bea5dd5b9e5b9c4eb838dd89bb85200c434aa]
#    to [fbef84d6f575c4f14850b8a8e7d78e42021a0e80]
#
============================================================
--- diff_patch.cc	cb8bea5dd5b9e5b9c4eb838dd89bb85200c434aa
+++ diff_patch.cc	fbef84d6f575c4f14850b8a8e7d78e42021a0e80
@@ -307,7 +307,7 @@ void merge_extents(vector<extent> const
         }

       // mutual or single-edge deletes
-      else if ((i->type == deleted && j->len == deleted)
+      else if ((i->type == deleted && j->type == deleted)
                || (i->type == deleted && j->type == preserved)
                || (i->type == preserved && j->type == deleted))
         {