remove_branches(): remove temporary

[thirdparty/git.git] / diff.h

diff --git a/diff.h b/diff.h
index f6fdf49e14b7c0e2997e7516275013555555e908..c7ad42addf8e4cd91b423d96526a5557473e5688 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;
@@ -176,7 +181,7 @@ struct diff_options {
 
 enum color_diff {
        DIFF_RESET = 0,
-       DIFF_PLAIN = 1,
+       DIFF_CONTEXT = 1,
        DIFF_METAINFO = 2,
        DIFF_FRAGINFO = 3,
        DIFF_FILE_OLD = 4,