Changes for page Diff Module
Last modified by Michael Hamann on 2023/07/26 16:06
Change comment:
There is no comment for this version
Summary
-
Objects (1 modified, 0 added, 0 removed)
Details
- ExtensionCode.ExtensionClass[0]
-
- Description
-
... ... @@ -121,6 +121,11 @@ 121 121 #end 122 122 {{/code}} 123 123 124 +== Conflicts Display == 125 + 126 +Starting with {{code}}XWiki 11.7RC1{{/code}} the display diff API also allows to display information about conflicts. 127 +The APIs to build unified diff takes as input a list of conflict elements that have been computed during a merge: some conflict information are then available in the resulting unified diff blocks, and can be used to present conflicts and possible decisions inside an UI presenting unified diff. 128 + 124 124 = XML Diff = 125 125 126 126 This module provides an API to compute and display the changes between 2 XML trees (DOM instances). It was introduced in XWiki 11.6RC1.