Skip to content

Commit 9c69ad2

Browse files
newrengitster
authored andcommitted
t6423: fix a comment that accidentally reversed two commits
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e40eefb commit 9c69ad2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

t/t6423-merge-rename-directories.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5549,9 +5549,9 @@ test_expect_success '13b(info): messages for transitive rename with conflicted c
55495549
# Commit A: y/{b,c,d}, x/e
55505550
# Commit B: z/{b,c,d}, x/e
55515551
# Expected: y/{b,c,d}, x/e, with info or conflict messages for d
5552-
# A: renamed x/d -> z/d; B: renamed z/ -> y/ AND renamed x/d to y/d
5553-
# One could argue A had partial knowledge of what was done with
5554-
# d and B had full knowledge, but that's a slippery slope as
5552+
# B: renamed x/d -> z/d; A: renamed z/ -> y/ AND renamed x/d to y/d
5553+
# One could argue B had partial knowledge of what was done with
5554+
# d and A had full knowledge, but that's a slippery slope as
55555555
# shown in testcase 13d.
55565556

55575557
test_setup_13c () {

0 commit comments

Comments
 (0)