X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=merge.tex;h=90f5ab2ede0ee1cbc92ccaf41374242f5cb72028;hp=7a48a25cf994a282b5c1d74d019af0f45aafb7d2;hb=3ac7463b1a5b9e66ccde2ab7f5a16a294812114e;hpb=dbc2fa88cece12d33ca5788ad5d359f77676a802 diff --git a/merge.tex b/merge.tex index 7a48a25..90f5ab2 100644 --- a/merge.tex +++ b/merge.tex @@ -170,7 +170,7 @@ 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$, +By Tip Own Contents, $L \haspatch \p$ so $L \neq X$, therefore we must have $L=Y$, $R=X$. By Tip Merge $M = \baseof{L}$ so $M \in \pn$ so by Base Acyclic $M \nothaspatch \p$. By $\merge$, $D \isin C$,