diff options
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java index a59dd743f..aaa6eb4c0 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java @@ -32,24 +32,24 @@ public interface IStreamMerger { * Indicates the successful completion of the merge operation (value <code>IStatus.OK</code>) */ public static final int OK= IStatus.OK; - + /** * Indicates that a change conflict prevented the merge from successful completion (value <code>1</code>) */ public static final int CONFLICT= 1; - + /** * Status code describing an internal error (value <code>2</code>) */ public static final int INTERNAL_ERROR= 2; - + /** * Performs a merge operation on the given input streams and writes the merge result to the output stream. - * On success a status <code>IStatus.OK</code> is returned, on error a status <code>IStatus.ERROR</code>. + * On success a status <code>IStatus.OK</code> is returned, on error a status <code>IStatus.ERROR</code>. * If the merge operation cannot deal with conflicts, the code of the error status has the value <code>IStreamMerger.CONFLICT</code>. * For text oriented mergers the encoding for the input and output streams is honored. - * It is the responsibility of callers to close input and output streams. - * + * It is the responsibility of callers to close input and output streams. + * * @param output the byte stream to which the merge result is written; the merger will not close the stream * @param outputEncoding the encoding to use when writing to the output stream * @param ancestor the byte stream from which the common ancestor is read |