New test case: merge with directory/file conflicts

[git.git] / run-command.h

diff --git a/run-command.h b/run-command.h
index 4f64613..5ee0972 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -11,6 +11,7 @@ enum {
        ERR_RUN_COMMAND_WAITPID_NOEXIT,
 };
 
+int run_command_v(int argc, char **argv);
 int run_command(const char *cmd, ...);
 
 #endif