return r; return (mergeAlgorithm.merge(RawTextComparator.DEFAULT, baseText, ourText, theirsText));
try mergeResult = mergeAlgorithm.merge( RawTextComparator.DEFAULT, new RawText(base.getBytes(charsetName)),
/** * Does the content merge. The three texts base, ours and theirs are * specified with {@link CanonicalTreeParser}. If any of the parsers is * specified as <code>null</code> then an empty text will be used instead. * * @param base * @param ours * @param theirs * * @return the result of the content merge * @throws IOException */ private MergeResult<RawText> contentMerge(CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs) throws IOException { RawText baseText = base == null ? RawText.EMPTY_TEXT : getRawText( base.getEntryObjectId(), reader); RawText ourText = ours == null ? RawText.EMPTY_TEXT : getRawText( ours.getEntryObjectId(), reader); RawText theirsText = theirs == null ? RawText.EMPTY_TEXT : getRawText( theirs.getEntryObjectId(), reader); return (mergeAlgorithm.merge(RawTextComparator.DEFAULT, baseText, ourText, theirsText)); }
return r; return (mergeAlgorithm.merge(RawTextComparator.DEFAULT, baseText, ourText, theirsText));