From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 15 Mar 2012 19:19:07 +0000 (+0000)
Subject: mention that merge can be used for dependency reinsertion
X-Git-Tag: f0.2~24
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=5e8082d7f849de019800368b07b08ecc43f9400e

mention that merge can be used for dependency reinsertion
---

diff --git a/article.tex b/article.tex
index 4af8e05..dc0ca18 100644
--- a/article.tex
+++ b/article.tex
@@ -800,6 +800,9 @@ Merge commits $L$ and $R$ using merge base $M$:
 \end{gather}
 We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
 
+This can also be used for dependency re-insertion, by setting
+$L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
+
 \subsection{Conditions}
 \[ \eqn{ Ingredients }{
  M \le L, M \le R