https://bugzilla.wikimedia.org/show_bug.cgi?id=29385
--- Comment #2 from Brion Vibber <[email protected]> 2011-06-13 23:42:35 UTC --- What does gnu diff3 have to do with the wikidiff extension? diff3 is used as an internal helper tool for resolving edit conflicts; its output is either a complete merged edit (gets saved to the wiki as a new revision) or the simple report that automatic merging could not be completed, requiring the user to manually resolve the conflict. wikidiff and wikidiff2 are C++ PHP extensions implementing 2-level paragraph-based and word-based text diff algorithm and HTML table formatting, used to produce output for the wiki's diff view UI, and compatible with the PHP implementation in MediaWiki. -- Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email ------- 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 [email protected] https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
