#8 diff3 gives error on conflicts

[alexis gallagher]

When I first tried using TextSync with conflicting
changes in the Palm copy of the text file and the
Desktop copy, the Hotsync Log gave showed diff3 giving
a verbose error message suggesting a mismatch between
different versions of cygwin. I do have cygwin
installed on this machine already.

I pointed TextSync to the correct version of my
diff3.exe, but it still fails when there's conflicting
changes. The HotSync log only says this:

---- Diff3 error output (256) ----
---------------------------------
GENERIC: Diff3 ended with error status!
\palm\textsync\src\TextSync\TextSync.cpp (767)

I have tried moving my text files to simply named
directories off the root, and temporarily removing the
bundled cygwin files out of the way, but I still get
the same error.

When I try running diff3 from the command line, it
gives a correct diff output of the conflicts, no
errors. I don't think it's returning an error code of
256, as far as I know.