chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip strategy
[topbloke-formulae.git]
/
strategy.tex
diff --git
a/strategy.tex
b/strategy.tex
index c870cfbcfe4f77ecf430531d585f51712146076f..bfd392224d6e5c854573b4988f4314fd66d40530 100644
(file)
--- a/
strategy.tex
+++ b/
strategy.tex
@@
-104,8
+104,8
@@
during the update algorithm).
\item[ $\tipcn, \tipcy$ ]
The new tips of the git branches $\pcn$ and $\pcy$, containing
\item[ $\tipcn, \tipcy$ ]
The new tips of the git branches $\pcn$ and $\pcy$, containing
-all the
correct commits (and the correct other patches), as
-generated by the Traversal phase of the update algorithm.
+all the
appropriate commits (and the appropriate other patches),
+
as
generated by the Traversal phase of the update algorithm.
\end{basedescript}
\end{basedescript}