Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Pearce2016-02-15 23:45:55 +0000
committerShawn Pearce2016-02-15 23:45:55 +0000
commit591e39bf9d26d6afc065a2dc8924b469743b60fd (patch)
tree7468ea63e9a2816decb8a0e759399f5a3cb9fb1c
parent979fa19110df0906a82e92e32d7d3ccf7eca3712 (diff)
downloadjgit-591e39bf9d26d6afc065a2dc8924b469743b60fd.tar.gz
jgit-591e39bf9d26d6afc065a2dc8924b469743b60fd.tar.xz
jgit-591e39bf9d26d6afc065a2dc8924b469743b60fd.zip
Revert "Fix warnings about unchecked conversion of MergeResult"
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java2
2 files changed, 2 insertions, 2 deletions
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 284657c598..d4a3d62dad 100644
--- 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 a9a8231eee..977f95341f 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 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);

Back to the top