• View
• Edit
• History
• Attach
• Print
• Backlinks

SimultaneousEdits

Questions answered by this recipe

How can I get simultaneous edits to work on systems that can't call the Unix diff3 command?

Answer

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.

Notes

Comments

caution: phppmerge does not show a conflicting change when a whole paragraph is removed.

See Also

• PmWiki.SimultaneousEdits

Contributors

• Pm