Fix unchecked conversion warning in MergeFormatter

Change-Id: Id57ef8b2e80736652e4c5062364efa3ccd39c4c7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java
index 977f95341fd3aff2e4cd50585c12879a64df00e4..a9a8231eee378fab6e01fa2aa00230e69d20199b 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java
@@ -102,7 +102,7 @@ public class MergeFormatter {
         *            metadata
         * @throws IOException
         */
-       public void formatMerge(OutputStream out, MergeResult res, String baseName,
+       public void formatMerge(OutputStream out, MergeResult<RawText> res, String baseName,
                        String oursName, String theirsName, String charsetName) throws IOException {
                List<String> names = new ArrayList<String>(3);
                names.add(baseName);