1.1 --- a/src/sml/ME/ctree.sml	Sat Mar 05 14:18:11 2005 +0100
     1.2 +++ b/src/sml/ME/ctree.sml	Sat Mar 05 14:36:49 2005 +0100
     1.3 @@ -1689,7 +1689,7 @@
     1.4  		     then [] else [([], Res)])) end;
     1.5  
     1.6  
     1.7 -(*########/ inserted from ctreeNEW.sml \#################################**)
     1.8 +(*########/ inserted from ctreeNEW.sml \#################################(**)
     1.9  
    1.10  (*.get all positions in a ptree until ([],Res) or ostate=Incomplete
    1.11  val get_allp = fn : 
    1.12 @@ -1838,7 +1838,7 @@
    1.13  		 end
    1.14  	 end;
    1.15  print_depth 3;
    1.16 -(*########\ inserted from ctreeNEW.sml /#################################**)
    1.17 +(**)########\ inserted from ctreeNEW.sml /#################################**)
    1.18  
    1.19  fun append_atomic p l f r f' s pt = 
    1.20    let (**)val _= writeln("#@append_atomic: pos ="^pos2str p)(**)

     2.1 --- a/src/sml/systest/auto-inform.sml	Sat Mar 05 14:18:11 2005 +0100
     2.2 +++ b/src/sml/systest/auto-inform.sml	Sat Mar 05 14:36:49 2005 +0100
     2.3 @@ -354,6 +354,7 @@
     2.4  
     2.5  
     2.6   moveDown 1 ([],Pbl); refFormula 1 ([1],Frm) (*x + 1 = 2*);
     2.7 +>>>>>>> 1.8
     2.8  
     2.9   moveDown 1 ([1  ],Frm); refFormula 1 ([1,1],Frm); 
    2.10   moveDown 1 ([1,1],Frm); refFormula 1 ([1,1],Res);