From e9a717cae2df3f857071b1dfb1684d6192966e28 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 16 Mar 2012 21:57:23 +0000 Subject: [PATCH 1/1] merge fixes/clarifications - clarify Non-Topbloke merges - add a wlog --- merge.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge.tex b/merge.tex index 5555236..e295d3f 100644 --- 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. -- 2.30.2