01375: support simultaneous edits/merging in windows

Description: The Cookbook:SimultaneousEdits recipe phpmerge.php no longer works. It generates the same error noted in PITS:01292

Can't demonstrate the error because it only shows up in the Apache error.log. Viz:

[Sun Jan 17 00:55:24.432767 2016] [:error] [pid 5672:tid 996] [client 192.168.2.100:54254] PHP Deprecated: Assigning the return value of new by reference is deprecated in C:\\xxx\\pmwiki\\cookbook\\phpmerge.php on line 793

NeilHerber January 17, 2016, at 10:37 AM

I've updated the script, please test it under different conditions and report if it works. --Petko February 15, 2016, at 04:11 PM