Revert "Fix warnings about unchecked conversion of MergeResult"

This reverts commit 979fa19110df0906a82e92e32d7d3ccf7eca3712.
Breaks API.

Change-Id: I54af657898d49f64d6906fe3edfb6b08e996d901

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java
index 284657c5981a6c1c88340c84c735911f8d0109ec..d4a3d62dad2660199cabdd74deeb99c5294e73f8 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java
@@ -259,7 +259,7 @@ public class MergeAlgorithmTest {
        }
 
        private String merge(String commonBase, String ours, String theirs) throws IOException {
-               MergeResult<RawText> r = new MergeAlgorithm().merge(RawTextComparator.DEFAULT,
+               MergeResult r = new MergeAlgorithm().merge(RawTextComparator.DEFAULT,
                                T(commonBase), T(ours), T(theirs));
                ByteArrayOutputStream bo=new ByteArrayOutputStream(50);
                fmt.formatMerge(bo, r, "B", "O", "T", Constants.CHARACTER_ENCODING);

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 a9a8231eee378fab6e01fa2aa00230e69d20199b..977f95341fd3aff2e4cd50585c12879a64df00e4 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<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);