[pmwiki-users] Merge after simultaneous edits does not work
nospam at mail.eton.ca
Thu Feb 24 10:50:58 CST 2005
At 2005-02-24 08:07 AM -0600, Patrick R. Michaud is rumored to have said:
>Yes, by default PmWiki needs access to the "diff3" program, typically
>available on Unix systems. Since you're running under Windows, it's
>probably not there.
>You might try the cookbook script at
>for a purely PHP-based solution. We could probably come up with
>a simpler implementation, also.
Would it be possible to make this a pure PHP solution via a switch? So
admins on Unix systems could still use the "crunchy goodness" (TM)
available to them, while us poor cousins on Windoze boxes wouldn't need to
edit all kinds of config files and scripts.
Perhaps a $WindowsInstall variable could be used for other purposes as well ...
Corporate info at http://www.eton.ca/
Eton Systems, 15 Pinepoint Drive, Nepean, ON, Canada K2H 6B1
Tel: (613) 829-4668
More information about the pmwiki-users