Changeset 782 for git/branches/dmik/t/t4133-apply-filenames.sh

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• t/t4133-apply-filenames.sh (modified) (1 diff)

git/branches/dmik/t/t4133-apply-filenames.sh ¶

@@ -31 +31 @@
 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
 '