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:
ec87cbf
)
anticommit make note re merge base vs merge rhs ordering
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 12:34:59 +0000
(12:34 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 12:34:59 +0000
(12:34 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 7f55e4fea15e0ba20f05978cfe052a2f5dee1101..ec02ceec2cd4b5fb0ab2851cdafc9d1cfefae2b7 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-444,6
+444,9
@@
Used for removing a branch dependency.
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$.
+(Note that the merge base $R^+ \not\le R^-$, i.e. the merge base is
+later than one of the branches to be merged.)
+
\subsection{No Replay}
No Replay for Merge Results applies. $\qed$