Revert "Fix unchecked conversion warning in MergeFormatter"

This reverts commit 6d4ebd168da236c5753f237e77b2dfcbb4e42065.

Change-Id: I01f0c7cd997b9b3577cc1e98ab1adb5cdc5b55e4

org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java

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 a9a8231..977f953 100644
--- 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 void formatMerge(OutputStream out, MergeResult<RawText> res,
 	 *            metadata
 	 * @throws IOException
 	 */
-	public void formatMerge(OutputStream out, MergeResult<RawText> res, String baseName,
+	public void formatMerge(OutputStream out, MergeResult res, String baseName,
 			String oursName, String theirsName, String charsetName) throws IOException {
 		List<String> names = new ArrayList<String>(3);
 		names.add(baseName);