wip traversal

[topbloke-formulae.git] / anticommit.tex

diff --git a/anticommit.tex b/anticommit.tex
index 2306a73e151075757b87891b3f9d17a447b9d88d..49931279917b36872d16a2f179788458ee4a7d17 100644 (file)
--- a/anticommit.tex
+++ b/anticommit.tex
@@ -8,7 +8,7 @@ Used for removing a branch dependency.
 \gathnext
  \patchof{C} = \patchof{L}
 \gathnext
- \mergeof{C}{L}{R^+}{R^-}
+ \commitmergeof{C}{L}{R^+}{R^-}
 \end{gather}
 
 \subsection{Conditions}
@@ -37,7 +37,7 @@ is a descendant, not an ancestor, of the 2nd parent.)
 
 \subsection{No Replay}
 
-By $\merge$,
+By \commitmergename,
 $D \isin C \implies D \isin L \lor D \isin R^- \lor D = C$.
 So, by Ordering of Ingredients,
 Ingredients Prevent Replay applies.  $\qed$
@@ -67,13 +67,13 @@ So $D \isin R^+$.
 
 By Base Acyclic for $R^-$, $D \not\isin R^-$.
 
-Apply $\merge$: $D \not\isin C$.  OK.
+Apply \commitmergename: $D \not\isin C$.  OK.
 
 \subsubsection{For $D \neq C, D \le L, D \notin \pry$:}
 
 By Tip Contents for $R^+$, $D \isin R^+ \equiv D \isin R^-$.
 
-Apply $\merge$: $D \isin C \equiv D \isin L$.  OK.
+Apply \commitmergename: $D \isin C \equiv D \isin L$.  OK.
 
 $\qed$
 
@@ -131,7 +131,7 @@ Single Parent Unique Tips applies.  $\qed$
 
 \subsection{Foreign Inclusion}
 
-Consider some $D$ s.t. $\patchof{D} = \bot$.  $D \neq C$.
+Consider some $D \in \foreign$.  $D \neq C$.
 So by Desired Contents $D \isin C \equiv D \isin L$.
 By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.