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

[bcpierce@cis.upenn.edu]

Author: bcpierce
Date: 2006-12-27 17:40:25 -0500 (Wed, 27 Dec 2006)
New Revision: 193

Modified:
   trunk/src/RECENTNEWS
   trunk/src/files.ml
   trunk/src/mkProjectInfo.ml
Log:
* Incorporated patch from Karl M. to invoke external merge utilities in a simpler
  way when running on windows.  On Unix systems, the merge command may
  send its output to either or both of its standard output and standard
  error pipes.  On windows, it should write only to stdout (if it
  writes anything to stderr, a hang may result).