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
unique tips: fix various \pendsof and \pancsof to refer to \py not \p
[topbloke-formulae.git]
/
merge.tex
diff --git
a/merge.tex
b/merge.tex
index 45b7f66f0cbddd4eeedba8446a19ee11ebb5bf16..7ca8446e353b04cfae492b534290e11335daceb2 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-48,9
+48,9
@@
$L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
}\]
\[ \eqn{ Suitable Tip }{
\bigexists_T
}\]
\[ \eqn{ Suitable Tip }{
\bigexists_T
- \pendsof{J}{\p} = \{ T \}
+ \pendsof{J}{\p
y
} = \{ T \}
\land
\land
- \forall_{E \in \pendsof{K}{\p}} T \ge E
+ \forall_{E \in \pendsof{K}{\p
y
}} T \ge E
, \text{where} \{J,K\} = \{L,R\}
}\]
\[ \eqn{ Foreign Merges }{
, \text{where} \{J,K\} = \{L,R\}
}\]
\[ \eqn{ Foreign Merges }{