summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-branches-one-merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:57:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:57:47 -0700
commit8cad7fcfbcba99fa1541bf6ca1f2ad83767fc348 (patch)
tree517fb1f20e9540a818f6d5b569f43917dbdeec22 /t/t5515/refs.br-branches-one-merge
parentMerge branch 'da/mergetool-delete-delete-conflict' into maint (diff)
parentsend-email: ignore trailing whitespace in mailrc alias file (diff)
downloadtgif-8cad7fcfbcba99fa1541bf6ca1f2ad83767fc348.tar.xz
Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint
"git send-email" had trouble parsing alias file in mailrc format when lines in it had trailing whitespaces on them. * jk/send-email-rtrim-mailrc-alias: send-email: ignore trailing whitespace in mailrc alias file
Diffstat (limited to 't/t5515/refs.br-branches-one-merge')
0 files changed, 0 insertions, 0 deletions