Merge git-gui into ml/git-gui-exec-path-fix

[thirdparty/git.git] / diffcore-break.c

diff --git a/diffcore-break.c b/diffcore-break.c
index 5462420bbbecceedd2366fc5506d4218230181c4..f57ece2757d46ea6dee3af34a476c5fdd9908b0d 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -1,9 +1,11 @@
 /*
  * Copyright (C) 2005 Junio C Hamano
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "hash.h"
+#include "object.h"
 #include "promisor-remote.h"
 
 static int should_break(struct repository *r,