Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff

* es/format-patch-interdiff:
format-patch: allow --interdiff to apply to a lone-patch
log-tree: show_log: make commentary block delimiting reusable
interdiff: teach show_interdiff() to indent interdiff
format-patch: teach --interdiff to respect -v/--reroll-count
format-patch: add --interdiff option to embed diff in cover letter
format-patch: allow additional generated content in make_cover_letter()

diff --cc Makefile
Simple merge

diff --cc builtin/log.c
index 574595132af4a799da3665543d19787e670b2791,e990027c282564e4e60f829a83b546db3604d5e5..fcc2f4dcc82c4bcba8165be8a87ced892ccd2a01
--- 1/builtin/log.c
--- 2/builtin/log.c
+++ b/builtin/log.c
@@@ -30,7 -30,7 +30,8 @@@
  #include "gpg-interface.h"
  #include "progress.h"
  #include "commit-slab.h"
 +#include "repository.h"
+ #include "interdiff.h"
  
  #define MAIL_DEFAULT_WRAP 72
  

diff --cc log-tree.c
Simple merge

diff --cc revision.h
Simple merge