emacs: Remove the no longer maintained vc-git package.

diff --git a/merge-index.c b/merge-index.c
index 7827e87a928586226570132fc8922991b1cb6c8a..aa9cf23a39ae271a53d1a0c05ac99be0e832b46a 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "run-command.h"
+#include "exec_cmd.h"
 
 static const char *pgm;
 static const char *arguments[9];
@@ -91,7 +92,9 @@ int main(int argc, char **argv)
        signal(SIGCHLD, SIG_DFL);
 
        if (argc < 3)
-               usage("git-merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
+               usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
+
+       git_extract_argv0_path(argv[0]);
 
        setup_git_directory();
        read_cache();