If there is another diff.exe present in one of the
directory in the PATH, diff3 start this one and not the
one in his own directory. This cause some problem like
this one:
TextSync v1.03: Started 10/28/04 11:35:40
merging: 'GoBoard.pas'(0) <->
'D:\WorkSpace\Palm\GoBoard.pas'
---- Diff3 error output (2) ----
c:\PROGRA~1\PVCS\vm\common\bin\win32\diff.exe:
unrecognized option `--'
Usage: diff .... blablabla ...
/cygdrive/c/Program Files/Palm/TextSync/diff3:
subsidiary program `diff' failed
---------------------------------
GENERIC: Diff3 ended with error status!
\palm\textsync\src\TextSync\TextSync.cpp (767)
ignoring: 'TestDoc.pas'(0)
ignoring: 'TestMemo.pas'(0)
OK TextSync: Finished avec 5 message(s) 10/28/04 11:35:47