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

[subversion@central.cis.upenn.edu]

Author: lescuyer
Date: 2005-07-13 14:47:57 -0400 (Wed, 13 Jul 2005)
New Revision: 87

Modified:
   trunk/src/files.ml
Log:
Changed the way Unison treats the outputs of a merge command, to handle the case where the merge is successful but both files are still left unequal (this happens with Harmony, for instance)