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:
7edfc98
)
merge: State C's inclusion in terms of stmtmergeof
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:18:11 +0000
(20:18 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:18:11 +0000
(20:18 +0100)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index 63817cad1f42cde111426bc749f892b1c020365b..e62282073f7d109da371696ff8fc37dfc1c58320 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 \\