merge fixes/clarifications - relax Foreign Merges

[topbloke-formulae.git] / merge.tex

diff --git a/merge.tex b/merge.tex
index 5e6dfdcc885879c0c036f6aafd28df9e6f5fc464..f153811f3e7864b0ebad85fb3db274f9adc96099 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
@@ -47,7 +47,7 @@ $L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
    \right]
 }\]
 \[ \eqn{ Foreign Merges }{
-    \patchof{L} = \bot \equiv \patchof{R} = \bot
+    \patchof{L} = \bot \implies \patchof{R} = \bot
 }\]
 
 \subsection{Non-Topbloke merges}