From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 21 Mar 2012 21:26:03 +0000 (+0000)
Subject: wip exclusive haspatch - clarify Merge Coherence (for neither haspatch)
X-Git-Tag: f0.3~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=410132e37a1f6e95cbfa9792d63b50b9390e59e4;p=topbloke-formulae.git

wip exclusive haspatch - clarify Merge Coherence (for neither haspatch)
---

diff --git a/merge.tex b/merge.tex
index 71ad81f..1ca4af7 100644
--- 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
-\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$.