motiejus
/
jgit
1
Fork 0
Code Releases Activity

Revert "Fix unchecked conversion warning in MergeFormatter" 

This reverts commit 6d4ebd168d.

Change-Id: I01f0c7cd997b9b3577cc1e98ab1adb5cdc5b55e4
This commit is contained in:
Shawn Pearce 2015-06-03 14:31:31 -04:00
parent d19ce2435d
commit fb21fb10fc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java
View File

@ -102,7 +102,7 @@ public void formatMerge(OutputStream out, MergeResult<RawText> res,
* 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);