Merge branch 'cb/xdiff-no-system-includes-in-dot-c'

diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 153342e44dd11ae357cc299a9214f4c365614a5e..2cc93bb69c522d99491cd8a9e02e211b2c3df807 100644 (file)
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -8,6 +8,7 @@
  * published by the Free Software Foundation.
  */
 
+#include "test-tool.h"
 #include "git-compat-util.h"
 #include "run-command.h"
 #include "argv-array.h"
@@ -49,7 +50,7 @@ static int task_finished(int result,
        return 1;
 }
 
-int cmd_main(int argc, const char **argv)
+int cmd__run_command(int argc, const char **argv)
 {
        struct child_process proc = CHILD_PROCESS_INIT;
        int jobs;