X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=fb7eab4b2619f8e2d5e7bbdac43d636ed2253fef;hb=05d6e35d69c91ddf88e8d5a5febea740bbfac22f;hp=1e7adc26461f2083df2e4199726814428a396255;hpb=588087cf4ec7d7c90cb21ac1b3790b86283ba992;p=topbloke-formulae.git diff --git a/article.tex b/article.tex index 1e7adc2..fb7eab4 100644 --- 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}