X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=ffd940fbb32410e9fbf755a4c0615ed31b170f08;hb=fd4fcf610bbe38767f7aba836c233bdc46e513e3;hp=1e7adc26461f2083df2e4199726814428a396255;hpb=70d3742a65313c482c967727c9110ec5c4a59695;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index 1e7adc2..ffd940f 100644
--- a/article.tex
+++ b/article.tex
@@ -96,6 +96,8 @@
 \newcommand{\baseof}[1]{\base ( #1 ) }
 \newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
 
+\newcommand{\foreign}{\bot}
+
 \newcommand{\allpatches}{\Upsilon}
 \newcommand{\assign}{\leftarrow}
 \newcommand{\iassign}{\leftarrow}
@@ -166,6 +168,7 @@
 \input{create-tip.tex}
 \input{anticommit.tex}
 \input{merge.tex}
+\input{pseudomerge.tex}
 
 \chapter{Update strategy}