From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Mar 2012 22:28:31 +0000 (+0000)
Subject: merge fixes/clarifications - clarify tip contents R \not\in \py
X-Git-Tag: f0.2~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=670d1b8cb1403203123ffd2d6c510f82bb7a335c

merge fixes/clarifications - clarify tip contents R \not\in \py
---

diff --git a/merge.tex b/merge.tex
index a34c9bc..f503821 100644
--- a/merge.tex
+++ b/merge.tex
@@ -220,8 +220,8 @@ $C \haspatch \p$ so by definition of $\haspatch$, $D \isin C \equiv D
 \subsubsection{For $D \not\in \py, R \not\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$.  So by definition of $\merge$, $D \isin
+$D \isin L \equiv D \isin \baseof{L}$, so by Tip Merge condition,
+$D \isin L \equiv D \isin M$.  So by $\merge$, $D \isin
 C \equiv D \isin R$.  And $R = \baseof{C}$ by Unique Base of $C$.
 Thus $D \isin C \equiv D \isin \baseof{C}$.  OK.