Skip to content

Commit

Permalink
Reverted changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@benedikt-schesch
benedikt-schesch committed Sep 16, 2024
1 parent 20b61d1 commit bd6b482
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/scripts/merge_tools/merging
Submodule merging updated 64 files
+30 −0 .github/workflows/gradle-native-compile.yml
+9 −4 .github/workflows/gradle.yml
+20 −26 README.md
+65 −16 build.gradle
+ − gradle/wrapper/gradle-wrapper.jar
+1 −1 gradle/wrapper/gradle-wrapper.properties
+5 −2 gradlew
+2 −0 gradlew.bat
+1 −1 settings.gradle
+0 −68 src/main/java/org/plumelib/merging/AbstractMergeDriver.java
+0 −107 src/main/java/org/plumelib/merging/AbstractMergeTool.java
+451 −0 src/main/java/org/plumelib/merging/AdjacentDynamicProgramming.java
+19 −6 src/main/java/org/plumelib/merging/AdjacentLinesMerger.java
+17 −3 src/main/java/org/plumelib/merging/GitLibrary.java
+36 −6 src/main/java/org/plumelib/merging/JavaAnnotationsMerger.java
+0 −113 src/main/java/org/plumelib/merging/JavaCommandLineOptions.java
+63 −33 src/main/java/org/plumelib/merging/JavaImportsMerger.java
+72 −10 src/main/java/org/plumelib/merging/JavaLibrary.java
+0 −171 src/main/java/org/plumelib/merging/JavaMergeDriver.java
+0 −119 src/main/java/org/plumelib/merging/JavaMergeTool.java
+344 −0 src/main/java/org/plumelib/merging/Main.java
+24 −49 src/main/java/org/plumelib/merging/MergeState.java
+1 −1 src/main/java/org/plumelib/merging/Merger.java
+23 −14 src/main/java/org/plumelib/merging/fileformat/ConflictedFile.java
+17 −20 src/main/java/org/plumelib/merging/fileformat/Diff3File.java
+6 −0 src/main/resources/META-INF/native-image/jni-config.json
+7 −0 src/main/resources/META-INF/native-image/predefined-classes-config.json
+5 −0 src/main/resources/META-INF/native-image/proxy-config.json
+125 −0 src/main/resources/META-INF/native-image/reflect-config.json
+29 −0 src/main/resources/META-INF/native-image/resource-config.json
+41 −0 src/main/resources/META-INF/native-image/serialization-config.json
+18 −10 src/main/sh/git-mergetool.sh
+12 −6 src/main/sh/merge-driver.sh
+13 −7 src/main/sh/merge-tool.sh
+54 −0 src/test/java/org/plumelib/merging/AdjacentDynamicProgrammingTest.java
+5 −5 src/test/java/org/plumelib/merging/JavaImportsMergerTest.java
+124 −0 src/test/resources/AdjacentTest5A.java
+124 −0 src/test/resources/AdjacentTest5B.java
+123 −0 src/test/resources/AdjacentTest5Base.java
+124 −0 src/test/resources/AdjacentTest5Goal.java
+204 −0 src/test/resources/AdjacentTest6A.java
+202 −0 src/test/resources/AdjacentTest6B.java
+201 −0 src/test/resources/AdjacentTest6Base.java
+204 −0 src/test/resources/AdjacentTest6Goal.java
+94 −0 src/test/resources/AnnotationsTest2A.java
+158 −0 src/test/resources/AnnotationsTest2B.java
+94 −0 src/test/resources/AnnotationsTest2Base.java
+172 −0 src/test/resources/AnnotationsTest2Goal.java
+172 −0 src/test/resources/AnnotationsTest2Merged.java
+555 −0 src/test/resources/ImportsTest10A.java
+556 −0 src/test/resources/ImportsTest10B.java
+550 −0 src/test/resources/ImportsTest10Base.java
+561 −0 src/test/resources/ImportsTest10Goal.java
+70 −0 src/test/resources/ImportsTest11A.java
+42 −0 src/test/resources/ImportsTest11B.java
+55 −0 src/test/resources/ImportsTest11Base.java
+69 −0 src/test/resources/ImportsTest11Goal.java
+160 −0 src/test/resources/ImportsTest12A.java
+159 −0 src/test/resources/ImportsTest12B.java
+165 −0 src/test/resources/ImportsTest12Base.java
+160 −0 src/test/resources/ImportsTest12Goal.java
+1 −1 src/test/resources/ImportsTest3Goal.java
+1 −1 src/test/resources/ImportsTest4Goal.java
+14 −12 src/test/resources/Makefile

0 comments on commit bd6b482

Please sign in to comment.