[Unison-hackers] [unison-svn] rev 89 - in trunk: . src src/ubase

[subversion@central.cis.upenn.edu]

Author: bcpierce
Date: 2005-07-14 13:21:39 -0400 (Thu, 14 Jul 2005)
New Revision: 89

Modified:
   trunk/Makefile
   trunk/src/Makefile
   trunk/src/RECENTNEWS
   trunk/src/files.ml
   trunk/src/mkProjectInfo.ml
   trunk/src/ubase/util.ml
   trunk/src/ubase/util.mli
Log:
* Couple more tweaks to the merging function.  I can run Unison together with Harmony now, it seems.