Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/SubmittingPatches: unify whitespace/tabs for the DCO
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 9fc71a2391bff6c718cab39865371d2b43bf15a0..fdb7d0f10ba471bcdff26dc87851d7df34fdc971 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-5,6
+5,7
@@
*/
#include "cache.h"
#include "advice.h"
+#include "lockfile.h"
#include "cache-tree.h"
#include "commit.h"
#include "blob.h"