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:
5eb2895
)
wip exclusive haspatch - clarify Merge Coherence (for neither haspatch)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 21 Mar 2012 21:26:03 +0000
(21:26 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 21 Mar 2012 21:26:03 +0000
(21:26 +0000)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index 71ad81fbc77d71247f48bbe786242696aa6073d9..1ca4af73574a7343d367fed94ebc945d105dc7a3 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-116,7
+116,7
@@
This involves considering $D \in \py$.
\subsubsection{For $L \nothaspatch \p, R \nothaspatch \p$:}
$D \not\isin L \land D \not\isin R$. $C \not\in \py$ (otherwise $L
\subsubsection{For $L \nothaspatch \p, R \nothaspatch \p$:}
$D \not\isin L \land D \not\isin R$. $C \not\in \py$ (otherwise $L
-\in \py$ ie $
\neg[ L \nothaspatch \p ]
$ by Tip Own Contents for $L$).
+\in \py$ ie $
L \haspatch \p
$ by Tip Own Contents for $L$).
So $D \neq C$.
Applying $\merge$ gives $D \not\isin C$ i.e. $C \nothaspatch \p$.
So $D \neq C$.
Applying $\merge$ gives $D \not\isin C$ i.e. $C \nothaspatch \p$.