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:
dbc2fa8
)
get rid of a leftover spurious \neg[]
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 25 Mar 2012 19:48:22 +0000
(20:48 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 25 Mar 2012 19:48:27 +0000
(20:48 +0100)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index 7a48a25cf994a282b5c1d74d019af0f45aafb7d2..90f5ab2ede0ee1cbc92ccaf41374242f5cb72028 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-170,7
+170,7
@@
And by $Y \haspatch \p$, $\exists_{F \in \py} F \le Y$ and this
$F \le C$ so this suffices.
Consider $D = C$: Thus $C \in \py, L \in \py$.
-By Tip Own Contents, $
\neg[ L \nothaspatch \p ]
$ so $L \neq X$,
+By Tip Own Contents, $
L \haspatch \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$,