merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/worktree.h b/worktree.h
index fe38ce10c300ba456f406950bf960d19d5d79cce..df3fc30f73692d296fc875bf1944813fa7e1fb3a 100644 (file)
--- a/worktree.h
+++ b/worktree.h
@@ -1,6 +1,7 @@
 #ifndef WORKTREE_H
 #define WORKTREE_H
 
+#include "cache.h"
 #include "refs.h"
 
 struct strbuf;