Skip to content

Commit

Permalink
Submodule update
Browse files Browse the repository at this point in the history
  • Loading branch information
@mernst
mernst committed May 3, 2024
1 parent 7056859 commit 12999bc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/scripts/merge_tools/merging
Submodule merging updated 21 files
+4 −1 build.gradle
+11 −20 src/main/java/org/plumelib/merging/AbstractMergeDriver.java
+21 −29 src/main/java/org/plumelib/merging/AbstractMergeTool.java
+21 −52 src/main/java/org/plumelib/merging/AdjacentLinesMerger.java
+9 −33 src/main/java/org/plumelib/merging/DmpLibrary.java
+5 −6 src/main/java/org/plumelib/merging/GitLibrary.java
+123 −163 src/main/java/org/plumelib/merging/JavaAnnotationsMerger.java
+2 −13 src/main/java/org/plumelib/merging/JavaCommandLineOptions.java
+126 −454 src/main/java/org/plumelib/merging/JavaImportsMerger.java
+94 −0 src/main/java/org/plumelib/merging/JavaLibrary.java
+26 −21 src/main/java/org/plumelib/merging/JavaMergeDriver.java
+13 −16 src/main/java/org/plumelib/merging/JavaMergeTool.java
+13 −30 src/main/java/org/plumelib/merging/MergeState.java
+75 −5 src/main/java/org/plumelib/merging/Merger.java
+40 −8 src/main/java/org/plumelib/merging/fileformat/ConflictedFile.java
+56 −0 src/main/java/org/plumelib/merging/fileformat/Diff3File.java
+7 −4 src/test/java/org/plumelib/merging/ConflictedFileTest.java
+37 −0 src/test/java/org/plumelib/merging/JavaAnnotationsMergerTest.java
+3 −31 src/test/java/org/plumelib/merging/JavaImportsMergerTest.java
+35 −0 src/test/java/org/plumelib/merging/JavaLibraryTest.java
+8 −8 src/test/resources/Makefile

0 comments on commit 12999bc

Please sign in to comment.