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:
This will cause PmWiki to attempt to merge simultaneous edits, denoting conflicting sections with <<<<<<< and >>>>>>> as appropriate.
Change log / release notes (Petko)
- 20160215: Fix messages "Deprecated: Assigning the return value of new by reference".
- 20170814: Update classes __construct functions for PHP 5 and 7, proposed by Asa Packer.
See discussion at SimultaneousEdits-Talk.