diff --git a/merge-index.c b/merge-index.c
index a9c8cc1f93a815a9b8226394e6f035a016fedbdb..a9983dd78ad5cd1e364f0e00c259bdb7e6f151f0 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-
#include "cache.h"
#include "cache.h"
-static const char *pgm = NULL;
+static const char *pgm;
static const char *arguments[8];
static int one_shot, quiet;
static int err;
static const char *arguments[8];
static int one_shot, quiet;
static int err;