Tim Jenks wrote:
Having trawled around the archives of this and some other lists and searching for a couple of hours, I have read that MediaWiki automatically merges simple edit-conflicts.
In practice using two separate setups (both Win32 - not my choice, work only uses windows systems):
[snip]
..even very basic edits do not auto merge and throw an edit conflict.
Automated conflict merging uses the GNU diff3 utility, which I suspect doesn't ship on Windows by default. ;)
Find and install a copy (I'm sure it exists...) and set $wgDiff3 to the path to the executable:
/** * Path to the GNU diff3 utility. If the file doesn't exist, edit conflicts will * fall back to the old behaviour (no merging). */ $wgDiff3 = '/usr/bin/diff3';
-- brion vibber (brion @ pobox.com)