svn_wc_merge() returned an unexpected error

  Following error occured this morning when I updated with a build from
  last night:

svn_error: #21046 : <Problem running log>
  in directory ./subversion/libsvn_fs

svn_error: #21046 : <Problem running log>
  start_handler: error processing command 'merge' in
./subversion/libsvn_fs

svn_error: #21089 : <Error calling external program>
  svn_wc_merge() returned an unexpected error

svn_error: #21089 : <Error calling external program>
  svn_io_run_diff3: Error running
c:\progra~1\cygnus\cygwin\bin\diff3.exe: exit
code was 2, args were:
in directory ., basenames:
./subversion/libsvn_fs/libsvn_fs.dsp.62692.00001.tmp
./subversion/libsvn_fs/libsvn_fs.dsp.62692.00001.tmp.62608.00001.tmp
./subversion/libsvn_fs/libsvn_fs.dsp.62692.00001.tmp.62612.00001.tmp

-- 
  Sebastian Bergmann
  http://sebastian-bergmann.de/                 http://phpOpenTracker.de/
  Did I help you? Consider a gift: http://wishlist.sebastian-bergmann.de/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org