/
uis
/
git
/
x
/
uis
/
git
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
lockfile.h: extract new header file for the functions in lockfile.c
[git/git.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index
8ad4be8
..
4b0884b
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"