From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 18 Apr 2012 20:44:08 +0000 (+0100)
Subject: merge: fix dependency reinsertion blurb to mention the need for the base to be merged... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=3ca0fff3d7e2f140e888ff286360a19db1828035;hp=16c8cf55a226dcb5cd8ee0e7ba2b0f3d16ab39d0

merge: fix dependency reinsertion blurb to mention the need for the base to be merged first
---

diff --git a/merge.tex b/merge.tex
index 7ca8446..465fcba 100644
--- a/merge.tex
+++ b/merge.tex
@@ -10,8 +10,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}$.
+This can also be used for dependency re-insertion, by setting $L \in
+\pn$, $R \in \pry$, $M = \baseof{R}$, provided that the Conditions are
+satisfied; in particular, provided that $L \ge \baseof{R}$.
 
 \subsection{Conditions}
 \[ \eqn{ Ingredients }{