#
#
# patch "rcs_import.cc"
#  from [a9b427a4a27a79afb68e424eba6492e289625f6e]
#    to [e9868286cc3fe3cce0d97d26137f7f03ecd9ab58]
#
============================================================
--- rcs_import.cc	a9b427a4a27a79afb68e424eba6492e289625f6e
+++ rcs_import.cc	e9868286cc3fe3cce0d97d26137f7f03ecd9ab58
@@ -3957,7 +3957,10 @@ resolve_intra_blob_conflicts_for_blob(cv
                 // events which are really the same, i.e. by Attic and real
                 // file.
                 if (ci->rcs_version != cj->rcs_version)
-                  continue;
+                  {
+                    j++;
+                    continue;
+                  }
               }
 
             // let the first take over its dependencies...