mirror of
https://github.com/java-diff-utils/java-diff-utils.git
synced 2026-03-13 10:11:17 +08:00
Merge pull request #203 from ngocnhan-tran1996/fix-typo
Fix typo javadoc
This commit is contained in:
@@ -28,7 +28,7 @@ import org.eclipse.jgit.diff.Sequence;
|
||||
import org.eclipse.jgit.diff.SequenceComparator;
|
||||
|
||||
/**
|
||||
* HistorgramDiff using JGit - Library. This one is much more performant than the orginal Myers
|
||||
* HistorgramDiff using JGit - Library. This one is much more performant than the original Myers
|
||||
* implementation.
|
||||
*
|
||||
* @author toben
|
||||
|
||||
@@ -24,7 +24,7 @@ public interface DiffAlgorithmListener {
|
||||
|
||||
/**
|
||||
* This is a step within the diff algorithm. Due to different implementations the value
|
||||
* is not strict incrementing to the max and is not garantee to reach the max. It could
|
||||
* is not strict incrementing to the max and is not guarantee to reach the max. It could
|
||||
* stop before.
|
||||
* @param value
|
||||
* @param max
|
||||
|
||||
@@ -26,7 +26,7 @@ import java.util.Objects;
|
||||
*
|
||||
* <p>
|
||||
* Text is represented as <code>Object[]</code> because the diff engine is
|
||||
* capable of handling more than plain ascci. In fact, arrays or lists of any
|
||||
* capable of handling more than plain ascii. In fact, arrays or lists of any
|
||||
* type that implements {@link java.lang.Object#hashCode hashCode()} and
|
||||
* {@link java.lang.Object#equals equals()} correctly can be subject to
|
||||
* differencing using this library.
|
||||
|
||||
@@ -224,7 +224,7 @@ public final class Patch<T> implements Serializable {
|
||||
private ConflictOutput<T> conflictOutput = CONFLICT_PRODUCES_EXCEPTION;
|
||||
|
||||
/**
|
||||
* Alter normal conflict output behaviour to e.g. inclide some conflict
|
||||
* Alter normal conflict output behaviour to e.g. include some conflict
|
||||
* statements in the result, like git does it.
|
||||
*/
|
||||
public Patch withConflictOutput(ConflictOutput<T> conflictOutput) {
|
||||
|
||||
Reference in New Issue
Block a user