X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge-recursive.c;h=3a64f5d0bdbcc8d7d21edb01f285cc8b41755228;hb=c2e86addb86689306b992065328ec52aa2479658;hp=c33091b3ed52bc8539ff82f039ec8c7718f3dcc2;hpb=3ea3860758cc2501388059a89c1e5f4a90acb50d;p=git.git diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index c33091b3e..3a64f5d0b 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "builtin.h" #include "commit.h" #include "tag.h" #include "merge-recursive.h"