From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 11 Mar 2012 08:32:59 +0000 (+0000)
Subject: wip merge tip contents
X-Git-Tag: f0.2~115
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=2076cf10e9c6db9325923bb35006587fe6a519f4

wip merge tip contents
---

diff --git a/article.tex b/article.tex
index 2121fb4..72230e3 100644
--- a/article.tex
+++ b/article.tex
@@ -638,7 +638,7 @@ And $\patchof{C} = \patchof{L}$
 so $L \in \py$ so $L \haspatch \p$.  We will use the coherence and
 patch inclusion of $C$ as just proved.
 
-Firstly we prove $C \haspatch \p$: If $R \in \py$, then $R \haspatch
+Firstly we show $C \haspatch \p$: If $R \in \py$, then $R \haspatch
 \p$ and by coherence/inclusion $C \haspatch \p$ .  If $R \not\in \py$
 then by Tip Merge $M = \baseof{L}$ so by Base Acyclic and definition
 of $\nothaspatch$, $M \nothaspatch \p$.  So by coherence/inclusion $C
@@ -650,9 +650,14 @@ We will consider some $D$ and prove the Exclusive Tip Contents form.
 $C \haspatch \p$ so by definition of $\haspatch$, $D \isin C \equiv D
 \le C$.  OK.
 
-xxx up to here
+\subsubsection{For $D \not\in \py, R \not\in \py$:}
 
-\subsubsection{For $L \in \py, D \not\in \py, R \in \py$:}
+$D \neq C$.  By Tip Contents of $L$,
+$D \isin L \equiv D \isin \baseof{L}$, and by Tip Merge condition,
+$D \isin L \equiv D \isin M$.  xxx up to here
+
+
+\subsubsection{For $D \not\in \py, R \in \py$:}
 
 
 %D \in \py$:}