Merge branch 'tg/conflict-marker-size' into maint

diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index e954e8c5222f77e882f577198091adde95cf2532..491400108608d4623704f30db0e4a8b5f3061dfe 100644 (file)
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -39,6 +39,9 @@ int cmd__submodule_config(int argc, const char **argv);
 int cmd__subprocess(int argc, const char **argv);
 int cmd__urlmatch_normalization(int argc, const char **argv);
 int cmd__wildmatch(int argc, const char **argv);
+#ifdef GIT_WINDOWS_NATIVE
+int cmd__windows_named_pipe(int argc, const char **argv);
+#endif
 int cmd__write_cache(int argc, const char **argv);
 
 #endif