--- Ricardo Rodríguez Your XEN ICT Team

...

...

Tim Starlingtstarling@wikimedia.org 22/03/07 6:18 >>>

Make sure you have diff3 installed and correctly set up. >$wgDiff3 should be set to the path to the binary. This is necessary for >MediaWiki to merge changes between conflicting edits.

-- Tim Starling

Thanks, Tim.

I've checked LocalSettings.php and there the concerned variable is set up as...

$wgDiff3 = "/usr/bin/diff3";

diff3 is in the correct placed in /usr/bin/diff3.

Please, Tim, how could I test the correct functioning of the utility? What must I expect of the utility integrated in MediaWiki? Thanks.

All the best,

Ricardo