[Unison-hackers] [unison-svn] rev 85 - trunk/src

[subversion@central.cis.upenn.edu]

Author: bcpierce
Date: 2005-07-12 19:26:32 -0400 (Tue, 12 Jul 2005)
New Revision: 85

Modified:
   trunk/src/RECENTNEWS
   trunk/src/files.ml
   trunk/src/fingerprint.ml
   trunk/src/mkProjectInfo.ml
   trunk/src/update.ml
   trunk/src/update.mli
Log:
* More work on merging functionality -- fixed one nasty bug in the
  code that updates the archive, but merging is still not completely
  working.