sync merge(1) fix diff from OpenRCS/OpenCVS
diff --git a/lib/diff3.c b/lib/diff3.c
index f9a22b0..89b27a7 100644
--- a/lib/diff3.c
+++ b/lib/diff3.c
@@ -541,7 +541,9 @@ ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
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);