chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
16c8cf5
)
merge: fix dependency reinsertion blurb to mention the need for the base to be merged...
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 18 Apr 2012 20:44:08 +0000
(21:44 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 18 Apr 2012 20:44:08 +0000
(21:44 +0100)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index 7ca8446e353b04cfae492b534290e11335daceb2..465fcba55b4ac0962c881302e4b632a412c59014 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 }{