Commit0174358

authored

Merge pull request#203 from ngocnhan-tran1996/fix-typo

Fix typo javadoc

2 parentsdb58b82 +d15ecbb commit0174358Copy full SHA for 0174358

File tree

-4

lines changed

java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit
- HistogramDiff.java
java-diff-utils/src/main/java/com/github/difflib
- algorithm
  - DiffAlgorithmListener.java
- patch
  - Chunk.java
  - Patch.java

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`importorg.eclipse.jgit.diff.SequenceComparator;`
`29`	`29`
`30`	`30`	`/**`
`31`		`- * HistorgramDiff using JGit - Library. This one is much more performant than theorginal Myers`
	`31`	`+ * HistorgramDiff using JGit - Library. This one is much more performant than theoriginal Myers`
`32`	`32`	`* implementation.`
`33`	`33`	`*`
`34`	`34`	`* @author toben`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public interface DiffAlgorithmListener {`
`24`	`24`
`25`	`25`	`/**`
`26`	`26`	`* This is a step within the diff algorithm. Due to different implementations the value`
`27`		`- * is not strict incrementing to the max and is notgarantee to reach the max. It could`
	`27`	`+ * is not strict incrementing to the max and is notguarantee to reach the max. It could`
`28`	`28`	`* stop before.`
`29`	`29`	`* @param value`
`30`	`30`	`* @param max`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*`
`27`	`27`	`* <p>`
`28`	`28`	`* Text is represented as <code>Object[]</code> because the diff engine is`
`29`		`- * capable of handling more than plainascci. In fact, arrays or lists of any`
	`29`	`+ * capable of handling more than plainascii. In fact, arrays or lists of any`
`30`	`30`	`* type that implements {@link java.lang.Object#hashCode hashCode()} and`
`31`	`31`	`* {@link java.lang.Object#equals equals()} correctly can be subject to`
`32`	`32`	`* differencing using this library.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ private int findPositionWithFuzzAndMoreDelta(PatchApplyingContext<T> ctx, Abstra`
`224`	`224`	`privateConflictOutput<T>conflictOutput =CONFLICT_PRODUCES_EXCEPTION;`
`225`	`225`
`226`	`226`	`/**`
`227`		`- * Alter normal conflict output behaviour to e.g.inclide some conflict`
	`227`	`+ * Alter normal conflict output behaviour to e.g.include some conflict`
`228`	`228`	`* statements in the result, like git does it.`
`229`	`229`	`*/`
`230`	`230`	`publicPatchwithConflictOutput(ConflictOutput<T>conflictOutput) {`

Comments

(0)