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 8ad4be897d88c691d43c30afb698a1ae952b8596..fdb7d0f10ba471bcdff26dc87851d7df34fdc971 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-3,8
+3,9
@@
* Fredrik Kuivinen.
* The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
*/
-#include "advice.h"
#include "cache.h"
+#include "advice.h"
+#include "lockfile.h"
#include "cache-tree.h"
#include "commit.h"
#include "blob.h"