chiark / gitweb /
merge: State C's inclusion in terms of stmtmergeof
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:18:11 +0000 (20:18 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:18:11 +0000 (20:18 +0100)
merge.tex

index 63817ca..e622820 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -131,6 +131,14 @@ $\qed$
 
 \subsection{Coherence and Patch Inclusion}
 
+$C$ satisfies
+\gathbegin
+  C \haspatch \p \lor C \nothaspatch \p
+\gathnext
+C \haspatch \p \equiv
+  \stmtmergeof{L \haspatch \p}{M \haspatch \p}{R \haspatch \p}
+\end{gather}
+which (given Coherence of $L$,$M$,$R$) is equivalent to
 $$
 \begin{cases}
   L \nothaspatch \p \land R \nothaspatch \p : & C \nothaspatch \p  \\