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
merge fixes/clarifications - change , to \land
[topbloke-formulae.git]
/
merge.tex
diff --git
a/merge.tex
b/merge.tex
index 5e6dfdcc885879c0c036f6aafd28df9e6f5fc464..e9b5aa26c7272d039d3f14a33dfb098563c466dd 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-15,7
+15,7
@@
$L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
\subsection{Conditions}
\[ \eqn{ Ingredients }{
- M \le L
,
M \le R
+ M \le L
\land
M \le R
}\]
\[ \eqn{ Tip Merge }{
L \in \py \implies