Merge branch 'jc/whitespace'

* jc/whitespace:
  git-apply: second war on whitespace.
  diff.c: second war on whitespace.

1 files changed, 1 insertions, 0 deletions

diff --git a/diff.h b/diff.h
index b60a02e627..3435fe7b3f 100644
--- a/diff.h
+++ b/diff.h
@@ -86,6 +86,7 @@ enum color_diff {
 	DIFF_FILE_OLD = 4,
 	DIFF_FILE_NEW = 5,
 	DIFF_COMMIT = 6,
+	DIFF_WHITESPACE = 7,
 };
 const char *diff_get_color(int diff_use_color, enum color_diff ix);