May 4, 2025 · Mar 25, 2025
diff --git a/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java b/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
 import org.eclipse.jgit.diff.SequenceComparator;

 /**
 * HistorgramDiff using JGit - Library. This one is much more performant than theorginal Myers
 * HistorgramDiff using JGit - Library. This one is much more performant than theoriginal Myers
 * implementation.
 *
 * @author toben
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java

    /**
     * This is a step within the diff algorithm. Due to different implementations the value
     * is not strict incrementing to the max and is notgarantee to reach the max. It could
     * is not strict incrementing to the max and is notguarantee to reach the max. It could
     * stop before.
     * @param value
     * @param max
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
 *
 * <p>
 * Text is represented as <code>Object[]</code> because the diff engine is
 * capable of handling more than plainascci. In fact, arrays or lists of any
 * capable of handling more than plainascii. 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.
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
    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) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,7 +28,7 @@
		import org.eclipse.jgit.diff.SequenceComparator;

		/**
		* HistorgramDiff using JGit - Library. This one is much more performant than theorginal Myers
		* HistorgramDiff using JGit - Library. This one is much more performant than theoriginal Myers
		* implementation.
		*
		* @author toben
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 notgarantee to reach the max. It could
		* is not strict incrementing to the max and is notguarantee to reach the max. It could
		* stop before.
		* @param value
		* @param max
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,7 +26,7 @@
		*
		* <p>
		* Text is represented as <code>Object[]</code> because the diff engine is
		* capable of handling more than plainascci. In fact, arrays or lists of any
		* capable of handling more than plainascii. 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.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -224,7 +224,7 @@ private int findPositionWithFuzzAndMoreDelta(PatchApplyingContext<T> ctx, Abstra
		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) {
Expand Down