@@ -259,7 +259,7 @@ public class MergeAlgorithmTest { | |||
} | |||
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); |
@@ -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); |