Skip to content

Commit

Permalink
Latest merging commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@benedikt-schesch
benedikt-schesch committed May 11, 2024
1 parent 8a88006 commit 2bb4fc8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/scripts/merge_tools/merging
Submodule merging updated 14 files
+23 −4 src/main/java/org/plumelib/merging/JavaAnnotationsMerger.java
+30 −4 src/main/java/org/plumelib/merging/JavaImportsMerger.java
+28 −0 src/main/java/org/plumelib/merging/fileformat/Diff3File.java
+7 −0 src/test/java/org/plumelib/merging/JavaAnnotationsMergerTest.java
+94 −0 src/test/resources/ImportsTest7A.java
+165 −0 src/test/resources/ImportsTest7B.java
+164 −0 src/test/resources/ImportsTest7Base.java
+183 −0 src/test/resources/ImportsTest7Goal-backward.java
+183 −0 src/test/resources/ImportsTest7Goal-forward.java
+94 −0 src/test/resources/ImportsTest8A.java
+110 −0 src/test/resources/ImportsTest8B.java
+164 −0 src/test/resources/ImportsTest8Base.java
+95 −0 src/test/resources/ImportsTest8Goal.java
+23 −7 src/test/resources/Makefile

0 comments on commit 2bb4fc8

Please sign in to comment.