[misc]

* fix a mistake in the javadoc
* improve javadoc format

xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/src/main/java/org/xwiki/store/merge/MergeManager.java

@@ -37,6 +37,7 @@ public interface MergeManager
 {
     /**
      * Perform a 3-way merge between the given strings by first splitting them into lines.
+     * <p>
      * The comparison is performed line by line.
      *
      * @param previousStr the previous string.
@@ -63,6 +64,7 @@ <T> MergeManagerResult<T, T> mergeObject(T previousObject, T newObject, T curren
 
     /**
      * Perform a 3-way merge between the given strings by first splitting them into arrays of characters.
+     * <p>
      * The comparison is performed character by character.
      *
      * @param previousStr the previous string.
@@ -76,6 +78,7 @@ MergeManagerResult<String, Character> mergeCharacters(String previousStr, String
 
     /**
      * Perform a 3-way merge between the list of elements.
+     * <p>
      * The current list is modified during the operation.
      *
      * @param commonAncestor the previous list.
@@ -90,8 +93,10 @@ <T> MergeManagerResult<List<T>, T> mergeList(List<T> commonAncestor, List<T> nex
 
     /**
      * Perform a 3-way merge between documents.
-     * Note that if {@link MergeConfiguration#isProvidedVersionsModifiables()} is {@code true} then the current document
-     * is cloned before the merge operation, else the given current document is directly modified for performance.
+     * <p>
+     * Note that if {@link MergeConfiguration#isProvidedVersionsModifiables()} is {@code false} then the current
+     * document is cloned before the merge operation, else the given current document is directly modified for
+     * performance.
      *
      * @param previousDoc the previous document.
      * @param nextDoc the next document.