From f11a862c007560f325ac57e618aef52e3c03d61c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 16 Mar 2012 22:00:55 +0000 Subject: [PATCH] merge fixes/clarifications - fix several P to \p --- merge.tex | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/merge.tex b/merge.tex index 2a3dd22..f6a3e93 100644 --- a/merge.tex +++ b/merge.tex @@ -163,22 +163,22 @@ Self Inpatch for $L$, $L \haspatch \p$, so $L=Y, R=X$. By Tip Merge, $M=\baseof{L}$. So by Base Acyclic $D \not\isin M$, i.e. $M \nothaspatch \p$. And indeed $D \isin C$ and $D \le C$. OK. -Consider $D \neq C, M \nothaspatch P, D \isin Y$: +Consider $D \neq C, M \nothaspatch \p, D \isin Y$: $D \le Y$ so $D \le C$. $D \not\isin M$ so by $\merge$, $D \isin C$. OK. -Consider $D \neq C, M \nothaspatch P, D \not\isin Y$: +Consider $D \neq C, M \nothaspatch \p, D \not\isin Y$: $D \not\le Y$. If $D \le X$ then $D \in \pancsof{X}{\py}$, so by Addition Merge Ends and Transitive Ancestors $D \le Y$ --- a contradiction, so $D \not\le X$. Thus $D \not\le C$. By $\merge$, $D \not\isin C$. OK. -Consider $D \neq C, M \haspatch P, D \isin Y$: +Consider $D \neq C, M \haspatch \p, D \isin Y$: $D \le Y$ so $D \in \pancsof{Y}{\py}$ so by Removal Merge Ends and Transitive Ancestors $D \in \pancsof{M}{\py}$ so $D \le M$. Thus $D \isin M$. By $\merge$, $D \not\isin C$. OK. -Consider $D \neq C, M \haspatch P, D \not\isin Y$: +Consider $D \neq C, M \haspatch \p, D \not\isin Y$: By $\merge$, $D \not\isin C$. OK. $\qed$ -- 2.30.2