summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-03 09:25:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-03 09:25:29 -0700
commite6658b9d6917d9888fa41702bf53393c57de0631 (patch)
tree107e97e2b52e8c434b265b0889d649ba72946ad9 /git-merge-resolve.sh
parentMerge branch 'jk/empty-archive' into maint (diff)
parentformat-patch: RFC 2047 says multi-octet character may not be split (diff)
downloadtgif-e6658b9d6917d9888fa41702bf53393c57de0631.tar.xz
Merge branch 'ks/rfc2047-one-char-at-a-time' into maint
When "format-patch" quoted a non-ascii strings on the header files, it incorrectly applied rfc2047 and chopped a single character in the middle of it. * ks/rfc2047-one-char-at-a-time: format-patch: RFC 2047 says multi-octet character may not be split
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions