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:
60388f8
)
clarify P sets none overlap
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 8 Mar 2012 18:35:07 +0000
(18:35 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 8 Mar 2012 18:35:07 +0000
(18:35 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index aef968a66d09117b2e396a4419f12ed55f948f95..ecd671ea2bc40e0f05e396bd788c33130b11b21a 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-121,7
+121,7
@@
A patch $\p$ consists of two sets of commits $\pn$ and $\py$, which
are respectively the base and tip git branches. $\p$ may be used
where the context requires a set, in which case the statement
is to be taken as applying to both $\py$ and $\pn$.
-
All these sets are distinct
. Hence:
+
None of these sets overlap
. Hence:
\item[ $ \patchof{ C } $ ]
Either $\p$ s.t. $ C \in \p $, or $\bot$.