Foreign Ancestry: rename from Foreign Contents (and Totally Foreign Ancestry too)

[topbloke-formulae.git] / merge.tex

diff --git a/merge.tex b/merge.tex
index 881dd249cce6b73a0a97e83b6173383af844c3df..1d22aec19d64ddcf5fd357660c3ca9580e3f546a 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -79,8 +79,8 @@ branch without Topbloke's assistance, it is also forbidden to
 merge any Topbloke-controlled branch into any plain git branch.
 
 Given those conditions, Tip Merge and Merge Acyclic do not apply.
-By Foreign Contents of $L$, $\isforeign{M}$ as well.
-So by Foreign Contents for any $A \in \{L,M,R\}$,
+By Foreign Ancestry of $L$, $\isforeign{M}$ as well.
+So by Foreign Ancestry for any $A \in \{L,M,R\}$,
 $\forall_{\p, D \in \py} D \not\le A$
 so $\pendsof{A}{\py} = \{ \}$ and the RHS of both Merge Ends
 conditions are satisifed.
@@ -320,11 +320,11 @@ OK
 
 $\qed$
 
-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}
 
 Only relevant if $\isforeign{L}$, in which case
 $\isforeign{C}$ and by Foreign Merges $\isforeign{R}$,
-so Totally Foreign Contents applies.  $\qed$
+so Totally Foreign Ancestry applies.  $\qed$
 
 \subsection{Bases' Children}