[pmwiki-users] Merge after simultaneous edits does not work
Patrick R. Michaud
pmichaud at pobox.com
Thu Feb 24 08:07:10 CST 2005
On Thu, Feb 24, 2005 at 10:33:21AM +0100, romat2 wrote:
> When second user saves a page that has been simultaneously edited by
> another user then the following message appears.
> [...]
> But the edit box is always empty. Are there any requirements for merge?
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
http://www.pmwiki.org/wiki/Cookbook/SimuleditWithoutPopen
for a purely PHP-based solution. We could probably come up with
a simpler implementation, also.
Pm
More information about the pmwiki-users
mailing list