Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
cmd_fetch_pack(): return early if finish_connect() fails
[gitweb.git]
/
builtin
/
merge-index.c
diff --git
a/builtin/merge-index.c
b/builtin/merge-index.c
index 2c4cf5e559b4166973f12bda567e1a6c5657a7e7..23388325879c5a52a4a8c25f254aafe23573e820 100644
(file)
--- a/
builtin/merge-index.c
+++ b/
builtin/merge-index.c
@@
-1,6
+1,5
@@
-#include "
cache
.h"
+#include "
builtin
.h"
#include "run-command.h"
-#include "exec_cmd.h"
static const char *pgm;
static int one_shot, quiet;