Commit Diff

Commit:
d473b4e492e89856bc4fea9aaea739bddd5c5e4b
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
fix merge bug inherited from OpenRCS, affecting lines with leading .
Actions:
Patch | Tree
commit - e90bef50467e4ba7dbdf2838e738f2652f25d0ee
commit + d473b4e492e89856bc4fea9aaea739bddd5c5e4b
blob - a04f3902152bc7dff80ea77f5d7132f765ac13b4
blob + f9a22b0761336360d40662fab1e984943637fff8
--- lib/diff3.c
+++ lib/diff3.c
@@ -541,7 +541,7 @@ ed_patch_lines(struct rcs_lines *dlines, struct rcs_li
 				if (lp == NULL)
 					return -1;
 
-				if (!memcmp(lp->l_line, ".", 1))
+				if (lp->l_len == 2 && lp->l_line[0] == '.')
 					break;
 
 				TAILQ_REMOVE(&(plines->l_lines), lp, l_list);