summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-21 07:06:58 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-21 07:09:28 (GMT)
commit757319309ac26d136d6f21a40c81fb53073c5dc9 (patch)
tree6a09e7ce97bba26d71ac1fe2ae32ea7347f6c33d /git-merge-ours.sh
parentd598075e52634665bd25a80b085e300d338d21f5 (diff)
downloadgit-757319309ac26d136d6f21a40c81fb53073c5dc9.zip
git-757319309ac26d136d6f21a40c81fb53073c5dc9.tar.gz
git-757319309ac26d136d6f21a40c81fb53073c5dc9.tar.bz2
mailinfo: decode underscore used in "Q" encoding properly.
Quoted-Printable (RFC 2045) and the "Q" encoding (RFC 2047) are subtly different; the latter is used on the mail header and an underscore needs to be decoded to 0x20. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions