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: add non-cyclic Condition to Base Merge (although I think it's implied by Merge...
[topbloke-formulae.git]
/
merge.tex
diff --git
a/merge.tex
b/merge.tex
index 1d22aec19d64ddcf5fd357660c3ca9580e3f546a..27deb9cee2d289f9e6d45684f40817b4f6cfe2a0 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-35,7
+35,7
@@
satisfied; in particular, provided that $L \ge \baseof{R}$.
\lor
R \in \foreign
\lor
- R \in \pqy
+ ( R \in \pqy \land \pq \neq \p )
\big]
}\]
\[ \eqn{ Merge Acyclic }{