psuedomerge: initial version

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 1e7adc26461f2083df2e4199726814428a396255..fb7eab4b2619f8e2d5e7bbdac43d636ed2253fef 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -166,6 +166,7 @@
 \input{create-tip.tex}
 \input{anticommit.tex}
 \input{merge.tex}
+\input{pseudomerge.tex}
 
 \chapter{Update strategy}