diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2016-02-16 01:06:02 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-02-16 01:06:11 +0100 |
| commit | ff5c756c79d1c10575b927cf3bb2eb1e1fcc391b (patch) | |
| tree | 7e1cc99ff5c12fbd745e43954d8a44dce3af6905 /org.eclipse.jgit | |
| parent | 514b11ddccc93cf21475cd3e61dde5d2ba8171f2 (diff) | |
| parent | 8c1d44e4366139ed971a98367962e7afb4893156 (diff) | |
| download | jgit-ff5c756c79d1c10575b927cf3bb2eb1e1fcc391b.tar.gz 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>
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 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); |