Questions answered by this recipe
How can I get simultaneous edits to work on systems that can't call the Unix diff3 command?
The phpmerge.phpΔ script replaces the merge function distributed with PmWiki with a version that doesn't require an external diff3 program. To use this script, simply copy it to the cookbook/ directory and add the following lines to local/config.php:
include_once('cookbook/phpmerge.php'); $EnableSimulEdit = 0; ## turn off pmwiki's version
This will cause PmWiki to attempt to merge simultaneous edits, denoting conflicting sections with <<<<<<< and >>>>>>> as appropriate.
caution: phppmerge does not show a conflicting change when a whole paragraph is removed.
I believe this is not working with php 5.3.14 anymore...
I get the following messages:
Deprecated: Assigning the return value of new by reference is deprecated in /home2/codexwik/public_html/cookbook/phpsimuledit.php on line 103, on line 357, on line 379, on line 401, on line 423, on line 457, on line 459, on line 493, on line 508, on line 671, on line 793, on line 808, on line 810, on line 812.
I tried to play a bit with the code, to upgrade to a more recent text_diff engine, but there are a number of other errors. Fixing this will require more work, so it is now added to PITS:01292. --Petko July 16, 2012, at 05:02 AM