Merge branch 'jc/tartree' into jc/builtin-n-tar-tree

diff --git a/diff.h b/diff.h
index 3027974c1ec74217a58345b4ab48e673ee3db710..c672277df25a6855e09e642cdf6341841b4dd5a3 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -153,6 +153,7 @@ extern int diff_queue_is_empty(void);
 #define DIFF_FORMAT_NAME       4
 #define DIFF_FORMAT_NAME_STATUS        5
 #define DIFF_FORMAT_DIFFSTAT   6
+#define DIFF_FORMAT_CHECKDIFF  7
 
 extern void diff_flush(struct diff_options*);