git: 9front

Info  •  Files  •  Log  •  Branches

merge3: overlap happens on the source offsets, not the dest offsets

--- a/sys/src/cmd/diff/merge3.c

+++ b/sys/src/cmd/diff/merge3.c

@@ -54,10 +54,10 @@

 {

 	if(l == nil || r == nil)

 		return 0;

-	if(l->a <= r->a)

-		return l->b >= r->a;

+	if(l->c <= r->c)

+		return l->d >= r->c;

 	else

-		return r->b >= l->a;

+		return r->d >= l->c;

 }

 char*

-- 

⑨