From: Ian Jackson Date: Tue, 6 Mar 2012 14:41:54 +0000 (+0000) Subject: add some xxx's X-Git-Tag: f0.2~142 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=1b7bb2a25de86ded197df472caad027f0111a449 add some xxx's --- diff --git a/article.tex b/article.tex index 4c7f22c..023a18a 100644 --- a/article.tex +++ b/article.tex @@ -461,6 +461,8 @@ Need to consider only $C \in \py$, ie $L \in \py$. xxx tbd +xxx need to finish anticommit + \section{Merge} Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$): @@ -523,4 +525,10 @@ That is, $\baseof{C} = R$. $\qed$ +\subsection{Coherence and patch inclusion} + +xxx tbd + +xxx need to finish merge + \end{document}