From a95c3485b6141faa1833701180536b9ed138c89a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 11 Mar 2012 16:09:27 +0000 Subject: [PATCH] anticommit clarify note re ingredient order --- article.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/article.tex b/article.tex index 008229a..090ae13 100644 --- a/article.tex +++ b/article.tex @@ -482,8 +482,8 @@ By Unique Tip, $R^+ \le L$. By definition of $\base$, $R^- \le R^+$ so $R^- \le L$. So $R^+ \le C$ and $R^- \le C$. $\qed$ -(Note that the merge base $R^+ \not\le R^-$, i.e. the merge base is -later than one of the branches to be merged.) +(Note that $R^+ \not\le R^-$, i.e. the merge base +is a descendant, not an ancestor, of the 2nd parent.) \subsection{No Replay} -- 2.30.2