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:
ec16deb
)
wip exclusive haspatch - fix Merge Coherence (for disagree)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 21 Mar 2012 21:25:48 +0000
(21:25 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 21 Mar 2012 21:25:48 +0000
(21:25 +0000)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index ca3304d26b0b5442f968f7f92a461f783e6ded13..71ad81fbc77d71247f48bbe786242696aa6073d9 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-162,6
+162,8
@@
We will show for each of
various cases that
if $M \haspatch \p$, $D \not\isin C$,
whereas if $M \nothaspatch \p$, $D \isin C \equiv \land D \le C$.
+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$,