[fix up some conflicts
John Meacham <john@repetae.net>**20060316131258] hunk ./E/Program.hs 62
+-- | note, this will reset your entry points
hunk ./E/Program.hs 65
-programSetE (ELetRec ds mainBody) prog = programSetDs ((main,mainBody):ds) prog { progMainEntry = main } where
+programSetE (ELetRec ds mainBody) prog = programSetDs ((main,mainBody):ds) prog { progEntryPoints = [main], progMainEntry = main } where
hunk ./E/Program.hs 68
-programSetE e prog = prog { progCombinators = [(main,as,mainBody)], progMainEntry = main } where
+programSetE e prog = prog { progCombinators = [(main,as,mainBody)], progEntryPoints = [main], progMainEntry = main } where
hunk ./Grin/MangleE.hs 63
-    return prog -- (programPruneUnreachable prog)
+    return (programPruneUnreachable prog)
hunk ./docs/conventions.txt 29
+
+* TP@ - non type-erased version of function in case it was passed as an
+  argument to a rank-n function.