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

diff --git a/repository.h b/repository.h
index 58961037c4acbe825b0a8b257e9601da8bd29b37..9f16c42c1ed04af3bf2e7767c4fd6c05b28ccf9c 100644 (file)
--- a/repository.h
+++ b/repository.h
@@ -1,6 +1,8 @@
 #ifndef REPOSITORY_H
 #define REPOSITORY_H
 
+#include "path.h"
+
 struct config_set;
 struct git_hash_algo;
 struct index_state;