diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-13 01:23:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-14 00:52:47 +0200 |
| commit | fff1bb3a349687e262ba4fcf5f333af07be9d149 (patch) | |
| tree | c99244134339e8bc5152f7bfcef98c80149e9135 /t/t3507-cherry-pick-conflict.sh | |
| parent | i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 (diff) | |
| download | git-fff1bb3a349687e262ba4fcf5f333af07be9d149.tar.xz git-fff1bb3a349687e262ba4fcf5f333af07be9d149.zip | |
i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
| -rwxr-xr-x | t/t3507-cherry-pick-conflict.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index c0c8330c20..212ec54aaf 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -44,7 +44,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' ' test "$head" = "$newhead" ' -test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' " +test_expect_success 'advice from failed cherry-pick' " pristine_detach initial && picked=\$(git rev-parse --short picked) && @@ -56,7 +56,7 @@ test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' " EOF test_must_fail git cherry-pick picked 2>actual && - test_cmp expected actual + test_i18ncmp expected actual " test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' ' |