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
strategy: traversal, Tip-Merge, from base, Foreign Merges
[topbloke-formulae.git]
/
traversal.tex
diff --git
a/traversal.tex
b/traversal.tex
index 9ed717264b42e2cfe3fed1f357803c90e498282f..ab1e6d4ade011651642cbc61bf8ac5ab3e3a4aae 100644
(file)
--- a/
traversal.tex
+++ b/
traversal.tex
@@
-230,6
+230,7
@@
R = \tipcn$ and $M = \baseof{W}$.
\condproof{Merge Acyclic}{
By Base Acyclic, $\tipcn \nothaspatch \p$.
}
+ \condproof{Foreign Merges}{ Not applicable. }
TODO TBD