From: Junio C Hamano Date: Sat, 24 Dec 2005 08:14:31 GMT Subject: Re: [PATCH] qgit: allow overriding CCFLAGS Message-ID: <7vu0cy3o9k.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <43ACE80A.4070600@yahoo.it> Marco Costalba writes: > Thanks for the patch. > > I had a git error while applying: > $ git-am -k -u --3way /home/marco/tmp/ccflags.txt > tried to convert from latin-1 to ISO-8859-15, but your iconv does not work with it. > > It's more of a warning then en erorr because the process goes on an the patch > applies. Yes, and that warning is coming from a stupid typo. mailinfo.c should say "latin1", not "latin-1". The fix will be in 1.0.4, which I am preparing right now.