diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2015-04-12 01:26:50 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2015-05-29 00:15:32 +0200 |
| commit | 6d4ebd168da236c5753f237e77b2dfcbb4e42065 (patch) | |
| tree | c76df7cd429fb5e3d975c56f54144b18a60e820d /org.eclipse.jgit | |
| parent | 663ccd76f04017dab216825e9b72a962759ba2e4 (diff) | |
| download | jgit-6d4ebd168da236c5753f237e77b2dfcbb4e42065.tar.gz jgit-6d4ebd168da236c5753f237e77b2dfcbb4e42065.zip | |
Fix unchecked conversion warning in MergeFormatter
Change-Id: Id57ef8b2e80736652e4c5062364efa3ccd39c4c7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
| -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); |