notation: remove notation test file

[topbloke-formulae.git] / lemmas.tex

diff --git a/lemmas.tex b/lemmas.tex
index 72e00d61fc5b23d82252989bc578c8f18596a289..23e22f3285bbc2ec8544714a1ed4d8a04479121d 100644 (file)
--- a/lemmas.tex
+++ b/lemmas.tex
@@ -1,6 +1,6 @@
 \section{Some lemmas}
 
-\subsection{Alternative (overlapping) formulations of $\mergeof{C}{L}{M}{R}$}
+\subsection{Alternative (overlapping) formulations of $\commitmergeof{C}{L}{M}{R}$}
 $$
  D \isin C \equiv
   \begin{cases}
@@ -11,7 +11,7 @@ $$
     \text{as above with L and R exchanged}
   \end{cases}
 $$
-\proof{ ~ Truth table (ordered by original definition): \\
+\proof{ ~ Truth table (ordered by original definitions): \\
   \begin{tabular}{cccc|c|cc}
      $D = C$ &
           $\isin L$ &
@@ -175,12 +175,12 @@ $$
   \right]
  \implies
   \left[
-   \bigforall_{D \text{ s.t. } \patchof{D} = \foreign}
+   \bigforall_{D \in \foreign}
      D \isin C \equiv D \le C
   \right]
 $$
 \proof{
-Consider some $D$ s.t. $\patchof{D} = \foreign$.
+Consider some $D \in \foreign$.
 If $D = C$, trivially true.  For $D \neq C$,
 by Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
 And by Exact Ancestors $D \le L \equiv D \le C$.
@@ -192,20 +192,20 @@ Given conformant commits $A \in \set A$,
 $$
    \left[
     C \hasparents \set A \land
-    \patchof{C} = \foreign \land
-      \bigforall_{A \in \set A} \patchof{A} = \foreign
+    \isforeign{C} \land
+      \bigforall_{A \in \set A} \isforeign{A}
    \right]
   \implies
    \left[
   \bigforall_{D}
     D \le C
    \implies
-    \patchof{D} = \foreign
+    \isforeign{D}
    \right]
 $$
 \proof{
-Consider some $D \le C$.  If $D = C$, $\patchof{D} = \foreign$ trivially.
+Consider some $D \le C$.  If $D = C$, $\isforeign{D}$ trivially.
 If $D \neq C$ then $D \le A$ where $A \in \set A$.  By Foreign
-Contents of $A$, $\patchof{D} = \foreign$.
+Contents of $A$, $\isforeign{D}$.
 }