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:
38b8505
)
wip merge complex - final case?
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 8 Mar 2012 16:50:41 +0000
(16:50 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 8 Mar 2012 16:50:41 +0000
(16:50 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 080e482847aeeffa24fda58ec31b59cfe63205c8..dd4538988cdb51cc42c6dee6ab12edaf486126db 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-606,4
+606,7
@@
$D \le Y$ so $D \in \pancsof{Y}{\py}$ so by Merge Ends
and Transitive Ancestors $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$:
+By $\merge$, $D \not\isin C$. OK.
+
\end{document}