# 
# patch "ChangeLog"
#  from [442de6e8c2e4ae9c59b6350191fd04e3d47ade72]
#    to [7b060225f75201d67f68458d3e8349f051d28c8d]
# 
# patch "diff_patch.cc"
#  from [cb8bea5dd5b9e5b9c4eb838dd89bb85200c434aa]
#    to [fbef84d6f575c4f14850b8a8e7d78e42021a0e80]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 2005-06-16  Nathaniel Smith  <address@hidden>
 
+	* diff_patch.cc (merge_extents): Typo caught by anonymous reader.
+
+2005-06-16  Nathaniel Smith  <address@hidden>
+
 	* commands.cc (cat): Account for being in a subdir in 'cat file
 	REV PATH'.
 	* tests/t_cat_file_by_name.at: Test.
--- diff_patch.cc
+++ diff_patch.cc
@@ -307,7 +307,7 @@
         }
 
       // 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))
         {