lockfile.h: extract new header file for the functions in lockfile.c
[git/git.git] / builtin / merge.c
index be07f27..4513fad 100644 (file)
@@ -9,6 +9,7 @@
 #include "cache.h"
 #include "parse-options.h"
 #include "builtin.h"
+#include "lockfile.h"
 #include "run-command.h"
 #include "diff.h"
 #include "refs.h"