fix conflicts.

ibrahimAlii · ibrahimAlii · commit 9f967f98e1a3 · 2019-11-18T16:20:15.000+02:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -59,7 +59,7 @@ public static Patch<String> parseUnifiedDiff(List<String> diff) {
             Matcher m = UNIFIED_DIFF_CHUNK_REGEXP.matcher(line);
             if (m.find()) {
                 // Process the lines in the previous chunk
-                processTheLinesInPrevChunk(rawChunk, patch, old_ln, new_ln);
+                processLinesInPrevChunk(rawChunk, patch, old_ln, new_ln);
                 // Parse the @@ header
                 old_ln = m.group(1) == null ? 1 : Integer.parseInt(m.group(1));
                 new_ln = m.group(3) == null ? 1 : Integer.parseInt(m.group(3));
@@ -84,12 +84,12 @@ public static Patch<String> parseUnifiedDiff(List<String> diff) {
         }
 
         // Process the lines in the last chunk
-        processTheLinesInPrevChunk(rawChunk, patch, old_ln, new_ln);
+        processLinesInPrevChunk(rawChunk, patch, old_ln, new_ln);
 
         return patch;
     }
 
-    private static void processTheLinesInPrevChunk(List<String[]> rawChunk, Patch<String> patch, int old_ln, int new_ln) {
+    private static void processLinesInPrevChunk(List<String[]> rawChunk, Patch<String> patch, int old_ln, int new_ln) {
         String tag;
         String rest;
         if (!rawChunk.isEmpty()) {
