diff options
| author | Shawn Pearce <spearce@spearce.org> | 2016-02-15 19:00:48 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2016-02-15 19:00:50 -0500 |
| commit | 8c1d44e4366139ed971a98367962e7afb4893156 (patch) | |
| tree | 7077ad0b9ca6672d7c1fac0c453084cb14459089 | |
| parent | e9ce3a992ca5627cfa55aa0c5af7c42387c24709 (diff) | |
| parent | 591e39bf9d26d6afc065a2dc8924b469743b60fd (diff) | |
| download | jgit-8c1d44e4366139ed971a98367962e7afb4893156.tar.gz jgit-8c1d44e4366139ed971a98367962e7afb4893156.zip | |
Merge "Revert "Fix warnings about unchecked conversion of MergeResult"" into stable-4.2
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java | 2 |
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); |