Replace open-coded version of hash_sha1_file()

diff --git a/merge-index.c b/merge-index.c
index a9c8cc1f93a815a9b8226394e6f035a016fedbdb..646d090c58e774bdf0f412da39f4b67fd7a696c6 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
@@ -4,7 +4,7 @@
 
 #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;