diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-17 14:17:58 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-17 15:24:52 -0700 |
commit | 176943b9658b1fa9ae3972156100d831d19c3576 (patch) | |
tree | 19b39b2c585260ef38740ba3b2f4c9d78d5cc777 /mergetools/ecmerge | |
parent | Git 1.7.10.5 (diff) | |
download | tgif-176943b9658b1fa9ae3972156100d831d19c3576.tar.xz |
mailinfo: do not concatenate charset= attribute values from mime headers
"Content-type: text/plain; charset=UTF-8" header should not appear
twice in the input, but it is always better to gracefully deal with
such a case. The current code concatenates the value to the values
we have seen previously, producing nonsense such as "utf8UTF-8".
Instead of concatenating, forget the previous value and use the last
value we see.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions