motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Matthias Sohn 2016-02-16 01:06:02 +01:00
parent 514b11ddcc 8c1d44e436
commit ff5c756c79
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java
View File

@ -259,7 +259,7 @@ public void testEmptyTexts() throws IOException {
}
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);

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);