diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-08 11:04:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-08 11:04:02 +0900 |
| commit | a8e2394704d0543f4e1f1ac6ea532d098316d97e (patch) | |
| tree | 9120b53b6c93bb8db02997cb446a4311a7e21311 /t/t6437-submodule-merge.sh | |
| parent | Merge branch 'la/strvec-header-fix' (diff) | |
| parent | tests: teach callers of test_i18ngrep to use test_grep (diff) | |
| download | git-a8e2394704d0543f4e1f1ac6ea532d098316d97e.tar.gz git-a8e2394704d0543f4e1f1ac6ea532d098316d97e.zip | |
Merge branch 'jc/test-i18ngrep'
Another step to deprecate test_i18ngrep.
* jc/test-i18ngrep:
tests: teach callers of test_i18ngrep to use test_grep
test framework: further deprecate test_i18ngrep
Diffstat (limited to 't/t6437-submodule-merge.sh')
| -rwxr-xr-x | t/t6437-submodule-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh index daa507862c..70650521b0 100755 --- a/t/t6437-submodule-merge.sh +++ b/t/t6437-submodule-merge.sh @@ -480,7 +480,7 @@ test_expect_merge_algorithm failure success !FAIL_PREREQS 'directory/submodule c # We do not want files within the submodule to prevent the # merge from starting; we should not be writing to such paths # anyway. - test_i18ngrep ! "refusing to lose untracked file at" err + test_grep ! "refusing to lose untracked file at" err ) ' |