diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-08-10 22:29:15 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-08-10 15:59:01 -0700 |
| commit | 6c74948f2065bcab445a2db6d489147f84c73a53 (patch) | |
| tree | c75a463751b318015e970474abc5abb1a0766252 /t/t6416-recursive-corner-cases.sh | |
| parent | t6422: fix multiple errors with the mod6 test expectations (diff) | |
| download | tgif-6c74948f2065bcab445a2db6d489147f84c73a53.tar.xz | |
t6416, t6423: clarify some comments and fix some typos
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6416-recursive-corner-cases.sh')
| -rwxr-xr-x | t/t6416-recursive-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh index d272b418e4..fd98989b14 100755 --- a/t/t6416-recursive-corner-cases.sh +++ b/t/t6416-recursive-corner-cases.sh @@ -452,7 +452,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev # # So choice 5 at least provides some kind of conflict for the original case, # and can merge cleanly as expected with D1 and E3. It also made things just -# slightly funny for merging D1 and e$, where E4 is defined as: +# slightly funny for merging D1 and E4, where E4 is defined as: # Commit E4: Merge B & C, modifying 'a' and renaming to 'a2', and deleting 'a/' # in this case, we'll get a rename/rename(1to2) conflict because a~$UNIQUE # gets renamed to 'a' in D1 and to 'a2' in E4. But that's better than having |