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:
0186895
)
add some xxx's
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 6 Mar 2012 14:41:54 +0000
(14:41 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 6 Mar 2012 14:41:54 +0000
(14:41 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 4c7f22cbc50446b5a2997c39107e60932727085c..023a18a9340c7670e3ee89011177eb9010165e69 100644
(file)
--- 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}