https://bugzilla.wikimedia.org/show_bug.cgi?id=62698
Umherirrender <umherirrender_de...@web.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |umherirrender_de...@web.de --- Comment #1 from Umherirrender <umherirrender_de...@web.de> --- Just for info: auto merge is mostly provided by diff3, which must not be not part of all mediawiki installation, but exist for wmf wikis. So the documentation for auto-merge should be mention, that merge is only done, when the software is there and it is a trivial merge without merge conflicts. -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. _______________________________________________ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l