aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-22 11:51:47 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-22 11:51:47 -0700
commit4692f32ddfb6a633c83d6a731f5a8cfbea218e7c (patch)
tree39805bfe1583b46f3d870867617a846b3db1a902 /merge-recursive.c
parentMerge branch 'nd/index-errno' (diff)
parentsend-email: improve RFC2047 quote parsing (diff)
downloadgit-4692f32ddfb6a633c83d6a731f5a8cfbea218e7c.tar.gz
git-4692f32ddfb6a633c83d6a731f5a8cfbea218e7c.zip
Merge branch 'tr/maint-send-email-2047'
"git send-email" did not unquote encoded words that appear on the header correctly, and lost "_" from strings. * tr/maint-send-email-2047: send-email: improve RFC2047 quote parsing
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions