Merge branch 'rt/cherry-revert-conflict-summary'

diff --git a/git-compat-util.h b/git-compat-util.h
index 426ae43be9cd7aa4230888ff0aa28ed2fd165ce0..ed11ad8119bb22db8a5428aed5525c40fbb72217 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -457,6 +457,9 @@ static inline int has_extension(const char *filename, const char *ext)
        return len > extlen && !memcmp(filename + len - extlen, ext, extlen);
 }
 
+/* in ctype.c, for kwset users */
+extern const char tolower_trans_tbl[256];
+
 /* Sane ctype - no locale, and works with signed chars */
 #undef isascii
 #undef isspace