diff options
| author | Matthias Sohn | 2016-02-16 00:06:02 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2016-02-16 00:06:11 +0000 |
| commit | ff5c756c79d1c10575b927cf3bb2eb1e1fcc391b (patch) | |
| tree | 7e1cc99ff5c12fbd745e43954d8a44dce3af6905 | |
| parent | 514b11ddccc93cf21475cd3e61dde5d2ba8171f2 (diff) | |
| parent | 8c1d44e4366139ed971a98367962e7afb4893156 (diff) | |
| download | jgit-ff5c756c79d1c10575b927cf3bb2eb1e1fcc391b.tar.gz jgit-ff5c756c79d1c10575b927cf3bb2eb1e1fcc391b.tar.xz jgit-ff5c756c79d1c10575b927cf3bb2eb1e1fcc391b.zip | |
Merge branch 'stable-4.2'
* stable-4.2:
Revert "Fix warnings about unchecked conversion of MergeResult"
Change-Id: I31c2e0679ad4cff77190858ac9a570d04841c386
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -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); |