merge fixes/clarifications - clarify Non-Topbloke merges - add a wlog

[topbloke-formulae.git] / merge.tex

diff --git a/merge.tex b/merge.tex
index 555523648032b9548b6eea604d4a9292ff0e3bd2..e295d3f4d2dbfb721b240c90ca12960c6eadcf45 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -59,7 +59,7 @@ 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.
-And by Foreign Contents for Y, $\forall_{\p, D \in \py} D \not\le Y$
+And by Foreign Contents for (wlog) Y, $\forall_{\p, D \in \py} D \not\le Y$
 so then by No Replay $D \not\isin Y$
 so $\neg [ Y \haspatch \p ]$ so neither
 Merge Ends condition applies.