Merge branch 'nd/no-the-index'

diff --git a/diff.h b/diff.h
index 20c697dbfef58d95d69bea00decc5aebee3d404a..3ada6ad33c0a03cccc5d0d65c848937945895cd6 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -312,7 +312,6 @@ void diff_change(struct diff_options *,
 struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
 
 #define DIFF_SETUP_REVERSE             1
-#define DIFF_SETUP_USE_CACHE           2
 #define DIFF_SETUP_USE_SIZE_CACHE      4
 
 /*