psuedomerge: initial version

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 0c10bcf095b02696681a91a33539695b10371f9a..fb7eab4b2619f8e2d5e7bbdac43d636ed2253fef 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -90,7 +90,7 @@
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
-\newcommand{\depsreq}{{\mathcal D}}
+\newcommand{\depsreq}{{\mathcal G}}
 
 \newcommand{\patchof}[1]{\patch ( #1 ) }
 \newcommand{\baseof}[1]{\base ( #1 ) }
@@ -166,6 +166,7 @@
 \input{create-tip.tex}
 \input{anticommit.tex}
 \input{merge.tex}
+\input{pseudomerge.tex}
 
 \chapter{Update strategy}