summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-06 21:35:25 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-06 21:37:53 -0800
commit8bc5c04a715ee0746df2bcd7e0924f4119140ad2 (patch)
treede8fb85e446ac0651361c529cdc3cefb45d7cb1d /git-merge-resolve.sh
parentcc55aaec38ddebd2e6f69fc3895cec393a61956e (diff)
downloadgit-8bc5c04a715ee0746df2bcd7e0924f4119140ad2.tar.gz
[PATCH] mailinfo: reset CTE after each multipart
If the first part uses quoted-printable to protect iso8859-1 name in the commit log, and the second part was plain ascii text patchfile without even Content-Transfer-Encoding subheader, we incorrectly tried to decode the patch as quoted printable. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions