[Unison-hackers] [unison-svn] rev 64 - branches/merge/src

[subversion at central.cis.upenn.edu]

Author: bcpierce
Date: 2005-06-28 16:02:57 -0400 (Tue, 28 Jun 2005)
New Revision: 64

Modified:
   branches/merge/src/.depend
   branches/merge/src/Makefile.OCaml
   branches/merge/src/RECENTNEWS
   branches/merge/src/copy.ml
   branches/merge/src/copy.mli
   branches/merge/src/files.ml
   branches/merge/src/files.mli
   branches/merge/src/globals.ml
   branches/merge/src/globals.mli
   branches/merge/src/mkProjectInfo.ml
   branches/merge/src/os.ml
   branches/merge/src/os.mli
   branches/merge/src/strings.ml
   branches/merge/src/transport.ml
   branches/merge/src/uicommon.ml
   branches/merge/src/update.ml
   branches/merge/src/update.mli
Log:
First cut at integrating Stephane's new backup / merging stuff