chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
88703e5
)
merge fixes/clarifications - clarify tip contents R \not\in \py
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 22:28:31 +0000
(22:28 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 22:28:31 +0000
(22:28 +0000)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index a34c9bcbac8753ae917462b975e7124aea784712..f5038213bc5ce7b97b067cc00fcaa63d5ac0bd76 100644
(file)
--- 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.