From 5eb289521e72ab31220fdf9ad5256cad88f2c76f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 21 Mar 2012 21:25:48 +0000 Subject: [PATCH] wip exclusive haspatch - fix Merge Coherence (for disagree) --- merge.tex | 2 ++ 1 file changed, 2 insertions(+) diff --git a/merge.tex b/merge.tex index ca3304d..71ad81f 100644 --- a/merge.tex +++ b/merge.tex @@ -162,6 +162,8 @@ We will show for each of various cases that if $M \haspatch \p$, $D \not\isin C$, whereas if $M \nothaspatch \p$, $D \isin C \equiv \land D \le C$. +And by $Y \haspatch \p$, $\exists_{F \in \py} F \le Y$ and this +$F \le C$ so this suffices. Consider $D = C$: Thus $C \in \py, L \in \py$. By Tip Own Contents, $\neg[ L \nothaspatch \p ]$ so $L \neq X$, -- 2.30.2