Merge branch 'jc/diff-ws-error-highlight'

diff --git a/diff.h b/diff.h
index f6fdf49e14b7c0e2997e7516275013555555e908..57762ee8b1fe83f9242b331eb3a90f01b8af9448 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -138,6 +138,11 @@ struct diff_options {
        int dirstat_permille;
        int setup;
        int abbrev;
+/* white-space error highlighting */
+#define WSEH_NEW 1
+#define WSEH_CONTEXT 2
+#define WSEH_OLD 4
+       unsigned ws_error_highlight;
        const char *prefix;
        int prefix_length;
        const char *stat_sep;