builtin/merge.c: drop a parameter that is never used

diff --git a/exec_cmd.h b/exec_cmd.h
index e2b546b615e2806bf7d733099ca0ac7bcfaef823..e4c9702f02858973096f6ef0f41e5a572ff4d0db 100644 (file)
--- a/exec_cmd.h
+++ b/exec_cmd.h
@@ -7,6 +7,7 @@ extern const char *git_exec_path(void);
 extern void setup_path(void);
 extern const char **prepare_git_cmd(const char **argv);
 extern int execv_git_cmd(const char **argv); /* NULL terminated */
+LAST_ARG_MUST_BE_NULL
 extern int execl_git_cmd(const char *cmd, ...);
 extern const char *system_path(const char *path);