Commit Diff

Commit:
acb4e1d19e58daa7f81698af44c07fe3173da4fa
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
sync merge(1) fix diff from OpenRCS/OpenCVS
Actions:
Patch | Tree
commit - 6c6b73bb412843c96a7dca913c41a91827d9018c
commit + acb4e1d19e58daa7f81698af44c07fe3173da4fa
blob - f9a22b0761336360d40662fab1e984943637fff8
blob + 89b27a76d95a86dc536d024d98960d0bb5f2db78
--- lib/diff3.c
+++ lib/diff3.c
@@ -541,7 +541,9 @@ ed_patch_lines(struct rcs_lines *dlines, struct rcs_li
 				if (lp == NULL)
 					return -1;
 
-				if (lp->l_len == 2 && lp->l_line[0] == '.')
+				if (lp->l_len == 2 &&
+				    lp->l_line[0] == '.' &&
+				    lp->l_line[1] == '\n')
 					break;
 
 				TAILQ_REMOVE(&(plines->l_lines), lp, l_list);