Change-Id: I1490b2209fa7b39676849c624adbc262a672f6df Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>tags/v4.3.0.201603230630-rc1
} | } | ||||
private String merge(String commonBase, String ours, String theirs) throws IOException { | private String merge(String commonBase, String ours, String theirs) throws IOException { | ||||
MergeResult r = new MergeAlgorithm().merge(RawTextComparator.DEFAULT, | |||||
MergeResult<RawText> r = new MergeAlgorithm().merge(RawTextComparator.DEFAULT, | |||||
T(commonBase), T(ours), T(theirs)); | T(commonBase), T(ours), T(theirs)); | ||||
ByteArrayOutputStream bo=new ByteArrayOutputStream(50); | ByteArrayOutputStream bo=new ByteArrayOutputStream(50); | ||||
fmt.formatMerge(bo, r, "B", "O", "T", Constants.CHARACTER_ENCODING); | fmt.formatMerge(bo, r, "B", "O", "T", Constants.CHARACTER_ENCODING); |
* metadata | * metadata | ||||
* @throws IOException | * @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 { | String oursName, String theirsName, String charsetName) throws IOException { | ||||
List<String> names = new ArrayList<String>(3); | List<String> names = new ArrayList<String>(3); | ||||
names.add(baseName); | names.add(baseName); |