X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=198ced4b05e9700e0a4e5ac41b07e0e8dad1c631;hp=740a2bc406c37588e03e7e676611d57ce7c8a8d7;hb=23129e4ede4f93a172b3eab8e51144f2488af972;hpb=d38e61b9455e0d0d4e9faadf5df29bb75a125331 diff --git a/article.tex b/article.tex index 740a2bc..198ced4 100644 --- a/article.tex +++ b/article.tex @@ -126,6 +126,8 @@ \begin{document} +\chapter{Data model} + \input{notation.tex} \input{invariants.tex} \input{lemmas.tex} @@ -136,6 +138,9 @@ \input{create-tip.tex} \input{anticommit.tex} \input{merge.tex} + +\chapter{Merge strategy} + \input{strategy.tex} \end{document}