Details
-
Bug
-
Resolution: Fixed
-
Major
-
1.35
-
None
-
Unknown
-
N/A
-
N/A
-
Description
New conflict and merge dialogs have been developed in 11.2 to 11.5.
The objective is to have the realtime module either use the internal conflict/merge or use the new one in XWiki and also handle properly when it's the one from XWiki being used.