Merge branch 'mg/maint-pull-suggest-upstream-to'

diff --git a/utf8.h b/utf8.h
index 3c0ae7624e027a802c38c4afb9fe5b0a590e093d..93ef60042c2fad93184b573f30e771ecddc842be 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -7,6 +7,7 @@ int utf8_width(const char **start, size_t *remainder_p);
 int utf8_strwidth(const char *string);
 int is_utf8(const char *text);
 int is_encoding_utf8(const char *name);
+int same_encoding(const char *, const char *);
 
 int strbuf_add_wrapped_text(struct strbuf *buf,
                const char *text, int indent, int indent2, int width);