object-name.h: move declarations for object-name.c functions from cache.h

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index ed5534eb57d4ffa874369bad189237d90a2f7cf5..748a6799a303f36184c2ce3cf2e594b10437a951 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -22,6 +22,7 @@
 #include "hex.h"
 #include "ll-merge.h"
 #include "lockfile.h"
+#include "object-name.h"
 #include "object-store.h"
 #include "repository.h"
 #include "revision.h"