builtin-merge: avoid run_command_v_opt() for recursive and subtree

diff --git a/utf8.h b/utf8.h
index a0d7f591adc3d86e5c813d79059c7c0335b32dc3..98cce1b038a908bec51ccd2f7e1c1f648cb429a1 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -1,8 +1,19 @@
 #ifndef GIT_UTF8_H
 #define GIT_UTF8_H
 
-int utf8_width(const char **start);
+typedef unsigned int ucs_char_t;  /* assuming 32bit int */
+
+ucs_char_t pick_one_utf8_char(const char **start, size_t *remainder_p);
+int utf8_width(const char **start, size_t *remainder_p);
 int is_utf8(const char *text);
-void print_wrapped_text(const char *text, int indent, int indent2, int len);
+int is_encoding_utf8(const char *name);
+
+int print_wrapped_text(const char *text, int indent, int indent2, int len);
+
+#ifndef NO_ICONV
+char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding);
+#else
+#define reencode_string(a,b,c) NULL
+#endif
 
 #endif