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:
4cb4b09
)
merge fixes/clarifications - remove wrong "on R"
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 21:59:19 +0000
(21:59 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 21:59:19 +0000
(21:59 +0000)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index a8dd9a7c6061530a7ebdb46b3975de9ff74fd7e3..2a3dd225fe71f24ee211f3d9f1c1788b8f3e09d4 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-100,7
+100,7
@@
That is, $\baseof{C} = \baseof{R}$.
\subsubsection{For $R \in \pn$:}
-By Tip Merge condition
on $R$
and since $M \le R$,
+By Tip Merge condition and since $M \le R$,
$A \le \baseof{L} \implies A \le R$, so
$A \le R \lor A \le \baseof{L} \equiv A \le R$.
Thus $A \le C \equiv A \le R$.