Merge branch 'dl/am-hg-locale' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:04:10 +0000 (10:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:04:10 +0000 (10:04 -0800)
"git am" did not parse datestamp correctly from Hg generated patch,
when it is run in a locale outside C (or en)

* dl/am-hg-locale:
am: invoke perl's strftime in C locale

1  2 
git-am.sh
diff --cc git-am.sh
Simple merge