From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Aug 2013 19:02:35 +0000 (+0100)
Subject: merge: add non-cyclic Condition to Base Merge (although I think it's implied by Merge... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=510466038ea660a384f7f8591cf1bda5dfdb9074

merge: add non-cyclic Condition to Base Merge (although I think it's implied by Merge Acyclic
---

diff --git a/merge.tex b/merge.tex
index 1d22aec..27deb9c 100644
--- 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 }{