summaryrefslogtreecommitdiff
path: root/mergetools/diffuse
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-05-22 05:30:29 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-05-27 09:59:22 -0700
commitfc1b774c72990f0ff92370316412b19fd72baa77 (patch)
tree8f0edeb30a61f3871c65234b59e1f72c1f989cb0 /mergetools/diffuse
parentstrbuf: add strbuf_reencode helper (diff)
downloadtgif-fc1b774c72990f0ff92370316412b19fd72baa77.tar.xz
remote-curl: reencode http error messages
We currently recognize an error message with a content-type "text/plain; charset=utf-16" as text, but we ignore the charset parameter entirely. Let's encode it to log_output_encoding, which is presumably something the user's terminal can handle. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/diffuse')
0 files changed, 0 insertions, 0 deletions