lockfile.h: extract new header file for the functions in lockfile.c
[git/git.git] / merge.c
diff --git a/merge.c b/merge.c
index 74ced7f..fcff632 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "lockfile.h"
 #include "commit.h"
 #include "run-command.h"
 #include "resolve-undo.h"