Commit 15a5c949ff1919c186b5ebf2bfcadcaca4939e04
2021-10-17T14:12:46
set oldo.to in diff3.c's duplicate() even if the file contains no newlines
diff --git a/lib/diff3.c b/lib/diff3.c
index cc1852c..8ec39e3 100644
--- a/lib/diff3.c
+++ b/lib/diff3.c
@@ -926,6 +926,10 @@ duplicate(int *dpl, int j, struct line_range *r1, struct line_range *r2,
}
} while (c != '\n');
}
+
+ /* original lines end here */
+ d3s->de[j + 1].oldo.to = off + nchar;
+
err = repos(nchar, d3s);
if (err)
return err;