Thanks very much, all up and running now.
As a note for anyone else with this issue, the cygwin port of diff3 works fine.
-Tim
On 8/31/06, Brion Vibber brion@pobox.com wrote
/**
- Path to the GNU diff3 utility. If the file doesn't exist, edit conflicts will
- fall back to the old behaviour (no merging).
*/ $wgDiff3 = '/usr/bin/diff3';
-- brion vibber (brion @ pobox.com)