Merge branch 'ab/blame-textconv'

* ab/blame-textconv:
  t/t8006: test textconv support for blame
  textconv: support for blame
  textconv: make the API public

Conflicts:
	diff.h

diff --cc builtin/blame.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
index 48abe7a96a96df98ef91d5f5d7ba9f57cace777f,2a0e36d7a5ff1a97f41b7de608bbefc6868711c7..063d10ac2216071ef218fab2ad51c13787614acf
--- 1/diff.h
--- 2/diff.h
+++ b/diff.h
@@@ -9,7 -9,8 +9,9 @@@
  struct rev_info;
  struct diff_options;
  struct diff_queue_struct;
 +struct strbuf;
+ struct diff_filespec;
+ struct userdiff_driver;
  
  typedef void (*change_fn_t)(struct diff_options *options,
                 unsigned old_mode, unsigned new_mode,
@@@ -74,6 -73,6 +76,7 @@@ typedef struct strbuf *(*diff_prefix_fn
  #define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
  #define DIFF_OPT_DIRTY_SUBMODULES    (1 << 24)
  #define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
++#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
  
  #define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
  #define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)