From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 12 Mar 2012 16:09:29 +0000 (+0000)
Subject: improve wording
X-Git-Tag: f0.2~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=151d200011cb73c9869fd9fe85e794bd324ffc86

improve wording
---

diff --git a/article.tex b/article.tex
index 65ef024..d852fb8 100644
--- a/article.tex
+++ b/article.tex
@@ -841,7 +841,7 @@ And $Y \not\in \py$ so $\neg [ Y \haspatch \p ]$ so neither
 Merge Ends condition applies.
 
 So a plain git merge of non-Topbloke branches meets the conditions and
-is therefore consistent with our scheme.
+is therefore consistent with our model.
 
 \subsection{No Replay}