lockfile.h: extract new header file for the functions in lockfile.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 8ad4be897d88c691d43c30afb698a1ae952b8596..4b0884b7bbdf177d6cfa2d07d3888cd212ec8a62 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -5,6 +5,7 @@
  */
 #include "advice.h"
 #include "cache.h"
+#include "lockfile.h"
 #include "cache-tree.h"
 #include "commit.h"
 #include "blob.h"