[Mediawiki-l] Re: diff3 glitch

[Steven Dick]

On Fri, 18 Mar 2005 13:19:37 +0100, not allowed <holladrio at gmail.com> wrote:
> there seems to be a small glitch with the diff3 handling:
> 
> if the system has a non-gnu diff3 (like solaris by default), the call
> to diff3 does not work, and the page is empty after the save. apache
> log shows than "usage: diff3 file1 file2 file3".

I also had this problem.  Replacing diff3 with gnu diff3 fixed the problem.

Add a line to LocalSettigs.php with the correct path to gnu diff3, for example:

$wgDiff3 = '/opt/sfw/bin/gdiff3';