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:
cd9af43
)
improve wording
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 12 Mar 2012 16:09:29 +0000
(16:09 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 12 Mar 2012 16:09:29 +0000
(16:09 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 65ef0246e5c5d6f21c38aa31511f1841d0d837f1..d852fb8a7be17b2b5acb9245c97997c7db40717c 100644
(file)
--- 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}