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:
23862a5
)
merge coherence complex - remove unneeded ref to def of haspatch
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Mar 2012 11:00:01 +0000
(11:00 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Mar 2012 11:00:01 +0000
(11:00 +0000)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index 5dc99ee548760ebeb80f908a8d1dd959416bd928..fc5df3bbba880e392eccee6b0da74581b7f04a42 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-166,7
+166,7
@@
By Tip Own Contents, $\neg[ L \nothaspatch \p ]$ so $L \neq X$,
therefore we must have $L=Y$, $R=X$.
By Tip Merge $M = \baseof{L}$ so $M \in \pn$ so
by Base Acyclic $M \nothaspatch \p$. By $\merge$, $D \isin C$,
-and $D \le C$
, consistent with $C \haspatch \p$
. OK.
+and $D \le C$. OK.
Consider $D \neq C, M \nothaspatch \p, D \isin Y$:
$D \le Y$ so $D \le C$.