X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=merge.tex;h=465fcba55b4ac0962c881302e4b632a412c59014;hb=79d94bd450348363f4ef717c3a6035e587b30c59;hp=7ca8446e353b04cfae492b534290e11335daceb2;hpb=d05ecd7d17e8149e44a4ed256edfb4f1fe4eb96e;p=topbloke-formulae.git 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 }{