chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor for coherence cases - simple
[topbloke-formulae.git]
/
annotations.tex
diff --git
a/annotations.tex
b/annotations.tex
index 72b00e8cc63055f3dbcb3db1a9e5fbd6d6b6ea0a..3401475b5ebb302312f4949641403363fa69a5e9 100644
(file)
--- a/
annotations.tex
+++ b/
annotations.tex
@@
-19,7
+19,7
@@
Whether $\baseof{C}$ is required, and if so what the value is, is
stated in the proof of Unique Base for each kind of commit.
$C \haspatch \p$ or $\nothaspatch \p$ is represented as a
stated in the proof of Unique Base for each kind of commit.
$C \haspatch \p$ or $\nothaspatch \p$ is represented as a
-list of $\p$ for which
it is known that
$C \haspatch \p$;
+list of $\p$ for which $C \haspatch \p$;
for any $\p$ not listed, $C \nothaspatch \p$.
Whether to record $C \haspatch \p$ in a new commit
is in stated
for any $\p$ not listed, $C \nothaspatch \p$.
Whether to record $C \haspatch \p$ in a new commit
is in stated