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
(parent:
a95c348
)
merge conditions into conditions
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 16:09:36 +0000
(16:09 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 16:09:36 +0000
(16:09 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 090ae13120114180e1a0d49e141f518d5cf15f1a..a86c22050a44b1316d629e4a33a56b1df63978b8 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-573,7
+573,7
@@
$\qed$
\section{Merge}
-Merge commits $L$ and $R$ using merge base $M$
($M < L, M < R$)
:
+Merge commits $L$ and $R$ using merge base $M$:
\gathbegin
C \hasparents \{ L, R \}
\gathnext
@@
-584,7
+584,9
@@
Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
\subsection{Conditions}
-
+\[ \eqn{ Ingredients }{
+ M \le L, M \le R
+}\]
\[ \eqn{ Tip Merge }{
L \in \py \implies
\begin{cases}