Merge branch 'rs/mailinfo-format-flowed'
commit6b472d9aafc522a99101de394f46ae284abe8c10
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:57 +0000 (17 13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:57 +0000 (17 13:53 -0700)
tree0bdaba0a2225199b98d33b065af2479dadcc3aaf
parent769af0fd9ea0b4de172b51ae4b9ea41b57c02fd3
parent3aa4d81f88d2f09173e65eebe35a385b2a064c87
Merge branch 'rs/mailinfo-format-flowed'

"git mailinfo" used in "git am" learned to make a best-effort
recovery of a patch corrupted by MUA that sends text/plain with
format=flawed option.

* rs/mailinfo-format-flowed:
  mailinfo: support format=flowed
builtin/am.c
mailinfo.h