From: Ian Jackson Date: Wed, 14 Mar 2012 23:18:50 +0000 (+0000) Subject: wip dependency insertion X-Git-Tag: f0.2~28 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=c39f3f1f5a5df2a4d628f335f7aaad44c0f68913 wip dependency insertion --- diff --git a/article.tex b/article.tex index ab0b51c..7ec582e 100644 --- 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$: