Update submodule

benedikt-schesch · May 10, 2024 · 2635188 · 2635188
1 parent 0ca0845
commit 2635188
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py
@@ -1,6 +1,11 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-"""Replay merges and their test results"""
+"""Replay merges and their test results.
+
+Typical usage:
+  replay_merge.py --idx INDEX
+where INDEX is, for example, 38-192 .
+"""
 import argparse
 import os
 import sys

diff --git a/src/scripts/merge_tools/merging b/src/scripts/merge_tools/merging
+15 −4		src/main/java/org/plumelib/merging/JavaImportsMerger.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/ImportsTest7Programmer.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
+94 −0		src/test/resources/ImportsTest8Programmer.java
+23 −7		src/test/resources/Makefile