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:
504314d
)
wip traversal
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 7 Jul 2012 17:15:57 +0000
(18:15 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 7 Jul 2012 17:15:57 +0000
(18:15 +0100)
trav-alg.tex
patch
|
blob
|
history
diff --git
a/trav-alg.tex
b/trav-alg.tex
index 3151ca491324aea0160a524516a11ea76e563815..8cbaa9a2cfae6a5f56c4489ac4ff35b27cd01eae 100644
(file)
--- a/
trav-alg.tex
+++ b/
trav-alg.tex
@@
-66,7
+66,7
@@
In some order, perhaps interleaving the two kinds of merge:
\begin{enumerate}
-\item For each $\pd \isdirdep \pc$, find a merge base
+\item For each $\
hasdep$-maximal $\
pd \isdirdep \pc$, find a merge base
$M \le W,\; \le \tipdy$ and merge $\tipdy$ into $W$.
That is, use $\alg{Merge}$ with $L = W,\; R = \tipdy$.
(Dependency Merge.)