projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0ddbbb6 ed43bc8)
t9139 uses ancient, backwards-compatible iconv names
authorEric Wong <normalperson@yhbt.net>
Sat, 30 May 2009 00:14:47 +0000 (17:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 May 2009 05:30:55 +0000 (22:30 -0700)
commit188643140bdcc5c8b7029058da87510cf1aeff50
tree25fe03a1303c1047e3b703650715e31f1da398cftree | snapshot
parent0ddbbb66614c7a503442ff863817ccbc68f417abcommit | diff
parented43bc8c4c30199cfba5e6ce9f8037c8c454cf5ccommit | diff
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>
builtin-log.c diff1 | diff2 | blob | history
t/t9129-git-svn-i18n-commitencoding.sh diff1 | diff2 | blob | history
t/t9139-git-svn-non-utf8-commitencoding.sh diff1 | | blob | history
Git—the stupid content tracker