Merge branch 'en/abort-df-conflict-fixes'

diff --git a/config.h b/config.h
index bb2f506b27137e8d66ab4cd96439143dced94780..1d56fe6aa28fe1a244118f00733e3829217b71ca 100644 (file)
--- a/config.h
+++ b/config.h
@@ -82,6 +82,7 @@ extern void git_config(config_fn_t fn, void *);
 extern int config_with_options(config_fn_t fn, void *,
                               struct git_config_source *config_source,
                               const struct config_options *opts);
+extern int git_parse_ssize_t(const char *, ssize_t *);
 extern int git_parse_ulong(const char *, unsigned long *);
 extern int git_parse_maybe_bool(const char *);
 extern int git_config_int(const char *, const char *);