[PATCH 2/5] t6423: fix a comment that accidentally reversed two commits
From: Elijah Newren via GitGitGadget <hidden>
Date: 2025-03-16 06:59:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Elijah Newren <redacted> The comment describing testcase 13b of t6423 somehow mixed up commits A and B in one paragraph. Fix the references. Signed-off-by: Elijah Newren <redacted> --- t/t6423-merge-rename-directories.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh
index 94080c65d12..ebf47cdd6b2 100755
--- a/t/t6423-merge-rename-directories.sh
+++ b/t/t6423-merge-rename-directories.sh@@ -5549,9 +5549,9 @@ test_expect_success '13b(info): messages for transitive rename with conflicted c # Commit A: y/{b,c,d}, x/e # Commit B: z/{b,c,d}, x/e # Expected: y/{b,c,d}, x/e, with info or conflict messages for d -# A: renamed x/d -> z/d; B: renamed z/ -> y/ AND renamed x/d to y/d -# One could argue A had partial knowledge of what was done with -# d and B had full knowledge, but that's a slippery slope as +# B: renamed x/d -> z/d; A: renamed z/ -> y/ AND renamed x/d to y/d +# One could argue B had partial knowledge of what was done with +# d and A had full knowledge, but that's a slippery slope as # shown in testcase 13d. test_setup_13c () {
--
gitgitgadget