Merge branch 'maint'

diff --git a/merge-index.c b/merge-index.c
index 0498a6f45e53947e356c6a390869d3f8194f05b7..a9c8cc1f93a815a9b8226394e6f035a016fedbdb 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
@@ -11,7 +11,8 @@ static int err;
 
 static void run_program(void)
 {
-       int pid = fork(), status;
+       pid_t pid = fork();
+       int status;
 
        if (pid < 0)
                die("unable to fork");