summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-21 18:47:44 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-21 18:47:44 -0700
commitbcd45e27d8790d8981d4c6734bc573363121efd3 (patch)
tree8693e3c78697d0ad72c976e798276c635bbc15cf /merge-tree.c
parentf5d5ea525b6aa8b6435d4e8c92f5e797b4076fc0 (diff)
parentc2ca1d79dbd54b06a05e5d14a897699e59dc9f9f (diff)
downloadgit-bcd45e27d8790d8981d4c6734bc573363121efd3.tar.gz
Merge branch 'bc/mailsplit-cr-at-eol'
* bc/mailsplit-cr-at-eol: Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used builtin-mailinfo,builtin-mailsplit: use strbufs strbuf: add new function strbuf_getwholeline()
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions