On 16/01/07, Charles Martin <Charles.Martin(a)sun.com> wrote:
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.
Rob Church