Avoid unnecessary "if-before-free" tests.

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index beccf85962b3f4cca9fa6b668fa904b59efbed52..8e73f07d7e35cd414c0f5cf347516e39921a7dd1 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -172,7 +172,9 @@ extern void diff_unmerge(struct diff_options *,
 #define DIFF_SETUP_USE_CACHE           2
 #define DIFF_SETUP_USE_SIZE_CACHE      4
 
+extern int git_diff_basic_config(const char *var, const char *value);
 extern int git_diff_ui_config(const char *var, const char *value);
+extern int diff_use_color_default;
 extern void diff_setup(struct diff_options *);
 extern int diff_opt_parse(struct diff_options *, const char **, int);
 extern int diff_setup_done(struct diff_options *);