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

[thirdparty/git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 225b70640660c59395a6731c4a7e646439f7c112..693f185d4d38f1f0f903ae0ba47c15a073732193 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -15,6 +15,7 @@
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
+#include "object-name.h"
 #include "parse-options.h"
 #include "builtin.h"
 #include "lockfile.h"