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

diff --git a/exec-cmd.h b/exec-cmd.h
index bddf5cb93413e3bb573eee8ec6c36811901815b7..8cd1df28d3f11d165bc91fc34c90fc94802c9f61 100644 (file)
--- a/exec-cmd.h
+++ b/exec-cmd.h
@@ -10,7 +10,7 @@ void setup_path(void);
 const char **prepare_git_cmd(struct argv_array *out, const char **argv);
 int execv_git_cmd(const char **argv); /* NULL terminated */
 LAST_ARG_MUST_BE_NULL
-extern int execl_git_cmd(const char *cmd, ...);
+int execl_git_cmd(const char *cmd, ...);
 char *system_path(const char *path);
 
 #endif /* GIT_EXEC_CMD_H */