diff3 error on WIndows

I was getting this error on update:

svn: Problem running log
svn: in directory
svn: start_handler: error processing command 'merge' in
svn: Error calling external program
svn: svn_io_run_diff3: Error running D:/cygwin/bin/diff3.exe: exitcode was
2, a
rgs were:
in directory ., basenames:
Prop.java.tmp
Prop.java.tmp.tmp
Prop.java.tmp.2.tmp

I discovered that Subversion is assuming the C: drive (system drive),
it ignores the drive specification in the registry and in the config file.
 I had installed both cygwin Subversion on D:.
After adding C:/cygwin/bin and copying diff diff3 to it, the errors went
away.

Roger Talkov

rtalkov@appworx.com
425-644-2121 x135
Received on Sat Oct 14 02:10:54 2006