Ricardo RodrÃguez escribió:
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
Without it, almost always two people edit the same page at the same time, the second one get an 'edit conflict'. With it, it automatically merges most of them without annoying the user.
Un saludo