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:
13abab8
)
merge tip contentss: clarify arbitrariness of D
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 11:05:24 +0000
(11:05 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 11:05:27 +0000
(11:05 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 0f1a24b9b723f69d3453e2eb73d3beab51154029..faf41526029fb4b0c489e4b8fedfe072d7f62dad 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-656,7
+656,8
@@
then by Tip Merge $M = \baseof{L}$ so by Base Acyclic and definition
of $\nothaspatch$, $M \nothaspatch \p$. So by Coherence/Inclusion $C
\haspatch \p$ (whether $R \haspatch \p$ or $\nothaspatch$).
-We will consider some $D$ and prove the Exclusive Tip Contents form.
+We will consider an arbitrary commit $D$
+and prove the Exclusive Tip Contents form.
\subsubsection{For $D \in \py$:}
$C \haspatch \p$ so by definition of $\haspatch$, $D \isin C \equiv D