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:
e41fe6d
)
wip dependency insertion
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 14 Mar 2012 23:18:50 +0000
(23:18 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 14 Mar 2012 23:18:50 +0000
(23:18 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index ab0b51cc47be09d22826c241807dbc3fcfd48a3e..7ec582e666ef94e6b55ba1e682e1866a1048cb03 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-896,6
+896,19
@@
OK.
$\qed$
+\subsection{Foreign Inclusion}
+
+Consider some $D$ s.t. $\patchof{D} = \bot$.
+
+By Tip Contents for $R^+$, $D \isin R^+ \equiv D \isin R^-$.
+So by $\merge$, $D \isin C \equiv D \isin L$.
+
+xxx up to here, need new condition
+
+$D \neq C$.
+
+
+
\section{Merge}
Merge commits $L$ and $R$ using merge base $M$: