chiark / gitweb /
mention that merge can be used for dependency reinsertion
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 15 Mar 2012 19:19:07 +0000 (19:19 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 15 Mar 2012 19:19:07 +0000 (19:19 +0000)
article.tex

index 4af8e05..dc0ca18 100644 (file)
@@ -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