[Unison-hackers] [unison-svn] r159 - trunk/src

[bcpierce@cis.upenn.edu]

Author: bcpierce
Date: 2006-05-30 21:01:02 -0400 (Tue, 30 May 2006)
New Revision: 159

Modified:
   trunk/src/RECENTNEWS
   trunk/src/files.ml
   trunk/src/mkProjectInfo.ml
   trunk/src/uimacbridge.ml
Log:
* Fixed a bug in merging code where Unison could sometimes deadlock
  with the external merge program, if the latter produced large
  amounts of output.

* Improved the handling of merging in the Mac GUI: merge
  results are now displayed in a separate window (like "diff") instead
  of flashing past in the status line at the top.