Merge branch 'rs/grep-no-recursive'

diff --git a/diff.h b/diff.h
index b88fccd2fb13b8bd7ae74d670b001ebb1980dc46..ce5e8a8183e848b2e36d50bea271f687a450e3af 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -195,6 +195,11 @@ struct diff_options {
        FILE *file;
        int close_file;
 
+#define OUTPUT_INDICATOR_NEW 0
+#define OUTPUT_INDICATOR_OLD 1
+#define OUTPUT_INDICATOR_CONTEXT 2
+       char output_indicators[3];
+
        struct pathspec pathspec;
        pathchange_fn_t pathchange;
        change_fn_t change;
@@ -455,7 +460,8 @@ size_t fill_textconv(struct repository *r,
  * and only if it has textconv enabled (otherwise return NULL). The result
  * can be passed to fill_textconv().
  */
-struct userdiff_driver *get_textconv(struct diff_filespec *one);
+struct userdiff_driver *get_textconv(struct index_state *istate,
+                                    struct diff_filespec *one);
 
 /*
  * Prepare diff_filespec and convert it using diff textconv API