Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Allow the user to control the verbosity of merge-recursive.
[gitweb.git]
/
merge-index.c
diff --git
a/merge-index.c
b/merge-index.c
index 646d090c58e774bdf0f412da39f4b67fd7a696c6..a9983dd78ad5cd1e364f0e00c259bdb7e6f151f0 100644
(file)
--- a/
merge-index.c
+++ b/
merge-index.c
@@
-1,7
+1,3
@@
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-
#include "cache.h"
static const char *pgm;