From d3266383df1c90e7ff2f28acd9ebbd217ffc6d55 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 6 Mar 2012 17:29:22 +0000
Subject: [PATCH] move merge X and Y def up

---
 article.tex | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/article.tex b/article.tex
index 3db83bf..a0adacb 100644
--- a/article.tex
+++ b/article.tex
@@ -474,6 +474,7 @@ Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
 \gathnext
  \mergeof{C}{L}{M}{R}
 \end{gather}
+We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
 
 \subsection{Conditions}
 
@@ -531,8 +532,6 @@ $\qed$
 Need to determine $C \haspatch P$ based on $L,M,R \haspatch P$.
 This involves considering $D \in \py$.  
 
-We will use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
-
 \subsubsection{For $L \nothaspatch P, R \nothaspatch P$:}
 $D \not\isin L \land D \not\isin R$.  $C \not\in \py$ (otherwise $L
 \in \py$ ie $L \haspatch P$ by Tip Self Inpatch).  So $D \neq C$.
-- 
2.30.2