On 16/01/07, Charles Martin
I appear to have a proper diff3, but what I'm
getting as a result is a
file called "index.php" with these contents (inserted as a quote to make
it stand out):
Disable the "use external diff" user preference.
... now, how did you know this?
Charles R. Martin | Sr Staff Engineer | Sun Microsystems