diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2016-02-15 18:22:53 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2016-02-15 18:22:53 +0900 |
| commit | 979fa19110df0906a82e92e32d7d3ccf7eca3712 (patch) | |
| tree | 23ec3b8742e1557f0762a1c3967db3d8858b39c5 /org.eclipse.jgit/src | |
| parent | cf8e0f34d93abdd9b06aeb9570f6fc0bed972d28 (diff) | |
| download | jgit-979fa19110df0906a82e92e32d7d3ccf7eca3712.tar.gz jgit-979fa19110df0906a82e92e32d7d3ccf7eca3712.zip | |
Fix warnings about unchecked conversion of MergeResult
Change-Id: I1490b2209fa7b39676849c624adbc262a672f6df
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
Diffstat (limited to 'org.eclipse.jgit/src')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 977f95341f..a9a8231eee 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 res, String baseName, + public void formatMerge(OutputStream out, MergeResult<RawText> res, String baseName, String oursName, String theirsName, String charsetName) throws IOException { List<String> names = new ArrayList<String>(3); names.add(baseName); |