diff options
| author | Eric Wong <normalperson@yhbt.net> | 2009-05-29 17:14:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-30 22:30:55 -0700 |
| commit | 188643140bdcc5c8b7029058da87510cf1aeff50 (patch) | |
| tree | 25fe03a1303c1047e3b703650715e31f1da398cf /t/t9500-gitweb-standalone-no-errors.sh | |
| parent | Merge git://git.bogomips.org/git-svn (diff) | |
| parent | t8005: fix typo, it's ISO-8859-5, not KOI8-R (diff) | |
| download | git-188643140bdcc5c8b7029058da87510cf1aeff50.tar.gz git-188643140bdcc5c8b7029058da87510cf1aeff50.zip | |
t9139 uses ancient, backwards-compatible iconv names
This resolves a semantic conflicts early to work with 5ae93df (t3900: use
ancient iconv names for backward compatibility, 2009-05-18).
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9500-gitweb-standalone-no-errors.sh')
| -rwxr-xr-x | t/t9500-gitweb-standalone-no-errors.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh index f4210fbb04..d539619e89 100755 --- a/t/t9500-gitweb-standalone-no-errors.sh +++ b/t/t9500-gitweb-standalone-no-errors.sh @@ -590,7 +590,7 @@ test_expect_success \ echo "ISO-8859-1" >> file && git add file && git config i18n.commitencoding ISO-8859-1 && - git commit -F "$TEST_DIRECTORY"/t3900/ISO-8859-1.txt && + git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt && git config --unset i18n.commitencoding && gitweb_run "p=.git;a=commit"' test_debug 'cat gitweb.log' |