Skip to content

Commit 0174358

Browse files
authored
Merge pull request #203 from ngocnhan-tran1996/fix-typo
Fix typo javadoc
2 parents db58b82 + d15ecbb commit 0174358

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.eclipse.jgit.diff.SequenceComparator;
2929

3030
/**
31-
* HistorgramDiff using JGit - Library. This one is much more performant than the orginal Myers
31+
* HistorgramDiff using JGit - Library. This one is much more performant than the original Myers
3232
* implementation.
3333
*
3434
* @author toben

java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public interface DiffAlgorithmListener {
2424

2525
/**
2626
* This is a step within the diff algorithm. Due to different implementations the value
27-
* is not strict incrementing to the max and is not garantee to reach the max. It could
27+
* is not strict incrementing to the max and is not guarantee to reach the max. It could
2828
* stop before.
2929
* @param value
3030
* @param max

java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
* <p>
2828
* Text is represented as <code>Object[]</code> because the diff engine is
29-
* capable of handling more than plain ascci. In fact, arrays or lists of any
29+
* capable of handling more than plain ascii. In fact, arrays or lists of any
3030
* type that implements {@link java.lang.Object#hashCode hashCode()} and
3131
* {@link java.lang.Object#equals equals()} correctly can be subject to
3232
* differencing using this library.

java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ private int findPositionWithFuzzAndMoreDelta(PatchApplyingContext<T> ctx, Abstra
224224
private ConflictOutput<T> conflictOutput = CONFLICT_PRODUCES_EXCEPTION;
225225

226226
/**
227-
* Alter normal conflict output behaviour to e.g. inclide some conflict
227+
* Alter normal conflict output behaviour to e.g. include some conflict
228228
* statements in the result, like git does it.
229229
*/
230230
public Patch withConflictOutput(ConflictOutput<T> conflictOutput) {

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy