Merge git://github.com/git-l10n/git-po

diff --git a/diff.h b/diff.h
index e25addb806a190f138a14ca64190fa5d2f311aaa..a658f85f2bc87864f673f737f70c8ad366ab7153 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -243,7 +243,6 @@ extern int parse_long_opt(const char *opt, const char **argv,
 
 extern int git_diff_basic_config(const char *var, const char *value, void *cb);
 extern int git_diff_ui_config(const char *var, const char *value, void *cb);
-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 void diff_setup_done(struct diff_options *);