On Wed, Sep 01 2021, Johannes Schindelin via GitGitGadget wrote:
> diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
> index e78c7e37969..3bb023d7669 100755
> --- a/t/t3427-rebase-subtree.sh
> +++ b/t/t3427-rebase-subtree.sh
> @@ -69,25 +69,6 @@ test_expect_success 'setup' '
> git commit -m "Empty commit" --allow-empty
> '
The comment at the start should be changed too, e.g. something like this
to squash in:
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index e78c7e37969..74e67b817f6 100755
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -36,11 +36,8 @@ commit_message() {
# where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.
#
# This commit history is then rebased onto `topic_3` with the
-# `-Xsubtree=files_subtree` option in three different ways:
-#
-# 1. using `--preserve-merges`
-# 2. using `--preserve-merges` and --keep-empty
-# 3. without specifying a rebase backend
+# `-Xsubtree=files_subtree` option, both with and without
+# specifying a rebase backend
test_expect_success 'setup' '
test_commit README &&
