X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge-index.c;h=23388325879c5a52a4a8c25f254aafe23573e820;hb=a080fdd1b15612f71e5cc660c108f7d6c03804dd;hp=2c4cf5e559b4166973f12bda567e1a6c5657a7e7;hpb=ae830c211bfbf192bcefb821130fe4943daf4291;p=git.git diff --git a/builtin/merge-index.c b/builtin/merge-index.c index 2c4cf5e55..233883258 100644 --- 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;