diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:45 -0700 |
| commit | 89efac81c716bb296098fd1c5482bac3ecb344c5 (patch) | |
| tree | d5a9e888d3858ba1b8f3b8dce037acf500f8a81d /t | |
| parent | The fourth batch (diff) | |
| parent | merge-ort: miscellaneous touch-ups (diff) | |
| download | tgif-89efac81c716bb296098fd1c5482bac3ecb344c5.tar.xz | |
Merge branch 'en/ort-perf-batch-12'
More fix-ups and optimization to "merge -sort".
* en/ort-perf-batch-12:
merge-ort: miscellaneous touch-ups
Fix various issues found in comments
diffcore-rename: avoid unnecessary strdup'ing in break_idx
merge-ort: replace string_list_df_name_compare with faster alternative
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6423-merge-rename-directories.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh index be84d22419..e834b7e6ef 100755 --- a/t/t6423-merge-rename-directories.sh +++ b/t/t6423-merge-rename-directories.sh @@ -454,7 +454,7 @@ test_expect_success '1f: Split a directory into two other directories' ' # the directory renamed, but the files within it. (see 1b) # # If renames split a directory into two or more others, the directory -# with the most renames, "wins" (see 1c). However, see the testcases +# with the most renames, "wins" (see 1f). However, see the testcases # in section 2, plus testcases 3a and 4a. ########################################################################### |