Re: diff3 error on WIndows

Roger Talkov rctalkov@appworx.com writes:
  After adding C:/cygwin/bin and copying diff diff3 to it,
  the errors went away.

Indeed, this trick made it!

Before:
###########################
$ svn merge -r1:3 .
svn: Error calling external program
svn: svn_io_run_diff3: Error running
c:\programme\cygwin\bin\diff3.exe: exitcode was 2, args were:
in directory ., basenames:
file.cpp.tmp
file.cpp.tmp.tmp
file.cpp.tmp.2.tmp
###########################

After:
###############
$ svn merge -r1:3 .
U file.cpp
A file2.cpp
###############

-- 
Freundliche Grüße/Kind Regards       Victor Ott
Salutari cordiale/Saludos cordiales  victor.ott at q-dsl dot de
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org