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

wip merge tip contents
---

diff --git a/article.tex b/article.tex
index 39a1287..643ef44 100644
--- a/article.tex
+++ b/article.tex
@@ -633,17 +633,18 @@ R$.  And $D \neq C$.  So $D \not\isin C$.  $\qed$
 
 \subsection{Tip Contents}
 
-xxx up to here
-
 We need worry only about $C \in \py$.  
 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$, this is true by
-coherence/inclusion $C \haspatch \p$.  If $R \not\in \py$ then
-by Tip Merge 
+Firstly we prove $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
+\haspatch \p$ (whether $R \haspatch \p$ or $\nothaspatch$).
 
+xxx up to here
 
 We will consider some $D$ and prove the Exclusive Tip Contents form.