chiark / gitweb /
strategy: traversal, Tip-Merge, from base, Foreign Merges
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 16 Jul 2012 04:57:55 +0000 (05:57 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 16 Jul 2012 04:57:55 +0000 (05:57 +0100)
traversal.tex

index 9ed717264b42e2cfe3fed1f357803c90e498282f..ab1e6d4ade011651642cbc61bf8ac5ab3e3a4aae 100644 (file)
@@ -230,6 +230,7 @@ R = \tipcn$ and $M = \baseof{W}$.
   \condproof{Merge Acyclic}{
    By Base Acyclic, $\tipcn \nothaspatch \p$.
   }
   \condproof{Merge Acyclic}{
    By Base Acyclic, $\tipcn \nothaspatch \p$.
   }
+  \condproof{Foreign Merges}{ Not applicable. }
 
   TODO TBD
 
 
   TODO TBD