From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 11 Mar 2012 16:09:36 +0000 (+0000)
Subject: merge conditions into conditions
X-Git-Tag: f0.2~82
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=89a887de02bb460be749f19b63735f23d9db5ea0

merge conditions into conditions
---

diff --git a/article.tex b/article.tex
index 090ae13..a86c220 100644
--- 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}