From: Ian Jackson Date: Sun, 11 Mar 2012 17:35:13 +0000 (+0000) Subject: Foreign Contents section in a couple of places X-Git-Tag: f0.2~77 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=8f764ce48b66831e1bf928cad8842d68d3a470af Foreign Contents section in a couple of places --- diff --git a/article.tex b/article.tex index 7630745..3d8bd81 100644 --- a/article.tex +++ b/article.tex @@ -459,6 +459,13 @@ $\qed$ If $D = C$, trivial. For $D \neq C$: $D \isin C \equiv D \isin A \equiv D \le A \equiv D \le C$. $\qed$ +\subsection{Foreign Contents:} + +Only relevant if $\patchof{C} = \bot$. Trivial by Foreign Contents of +$A$. $\qed$ + +xxx fixme not trivial use Totally Foreign Contents + \section{Create Base} Given $L$, create a Topbloke base branch initial commit $B$. @@ -628,6 +635,10 @@ Thus $D \isin C \equiv D \le C$. $\qed$ +\subsection{Foreign Contents:} + +Not applicable. $\qed$ + \section{Merge} Merge commits $L$ and $R$ using merge base $M$: @@ -888,4 +899,11 @@ OK $\qed$ +\subsection{Foreign Contents:} + +xxx use Totally Foreign Contents + +If $\patchof{C} = \bot$, by Foreign Merges +$\patchof{L} = \patchof{R} = \bot$. + \end{document}