Commit Diff

Commit:
15a5c949ff1919c186b5ebf2bfcadcaca4939e04
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
set oldo.to in diff3.c's duplicate() even if the file contains no newlines
Actions:
Patch | Tree
commit - 8383a50b870f78d970e3d7efa1addf07c3d4ef4a
commit + 15a5c949ff1919c186b5ebf2bfcadcaca4939e04
blob - cc1852c2e17d07738308f880e8aab6e8ec294106
blob + 8ec39e3af09c02989e1df349d533b1442550f19d
--- lib/diff3.c
+++ lib/diff3.c
@@ -926,6 +926,10 @@ duplicate(int *dpl, int j, struct line_range *r1, stru
 			}
 		} while (c != '\n');
 	}
+
+	/* original lines end here */
+	d3s->de[j + 1].oldo.to = off + nchar;
+
 	err = repos(nchar, d3s);
 	if (err)
 		return err;