diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-27 17:19:40 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-27 17:19:40 +0000 |
| commit | 7bf8e474d15414eda8520ba5258511d845ca6061 (patch) | |
| tree | 417d6cfc8946fce8e2f87fdf3ec964036abd495c /t/t4133-apply-filenames.sh | |
| parent | 45d74c4b0fe38218b4569a90da7102cf48d616c2 (diff) | |
| parent | e230c568c4b9a991e3175e5f65171a566fd8e39c (diff) | |
| download | git-7bf8e474d15414eda8520ba5258511d845ca6061.tar.gz | |
Merge tag 'v1.8.4' into baserock/morph
Git 1.8.4
Diffstat (limited to 't/t4133-apply-filenames.sh')
| -rwxr-xr-x | t/t4133-apply-filenames.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh index 94da99075c..2ecb4216b7 100755 --- a/t/t4133-apply-filenames.sh +++ b/t/t4133-apply-filenames.sh @@ -30,9 +30,9 @@ EOF test_expect_success 'apply diff with inconsistent filenames in headers' ' test_must_fail git apply bad1.patch 2>err && - grep "inconsistent new filename" err && + test_i18ngrep "inconsistent new filename" err && test_must_fail git apply bad2.patch 2>err && - grep "inconsistent old filename" err + test_i18ngrep "inconsistent old filename" err ' test_done |