chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0fa67d5
)
anticommit clarify note re ingredient order
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 16:09:27 +0000
(16:09 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 16:09:27 +0000
(16:09 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 008229a17c249447403c8039618b8914ffc6f224..090ae13120114180e1a0d49e141f518d5cf15f1a 100644
(file)
--- 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}