chiark / gitweb /
before NEW THEORY
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 22 Feb 2012 10:00:16 +0000 (10:00 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 22 Feb 2012 10:00:16 +0000 (10:00 +0000)
THEORY

diff --git a/THEORY b/THEORY
index f5518b0..d0fdab5 100644 (file)
--- a/THEORY
+++ b/THEORY
@@ -85,3 +85,19 @@ single patch dependency application
        P(C) = P(D)
        inpatch(P,C) = included
 
+simple merge
+ make C from L, R, M
+ where
+       M < L < C
+       M < R < C
+ result
+       C >1 { L, R }
+       P(C) = P(L)
+       if Cx isin L = Cx isin R,
+               Cx isin C = Cx isin L
+       otherwise
+               Cx isin C = ! Cx isin M
+       
+  cases of inpatch(P,L) and ,R
+               
+         or    Cx isin