chiark / gitweb /
merge: fix dependency reinsertion blurb to mention the need for the base to be merged...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 18 Apr 2012 20:44:08 +0000 (21:44 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 18 Apr 2012 20:44:08 +0000 (21:44 +0100)
merge.tex

index 7ca8446..465fcba 100644 (file)
--- 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 }{