Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
fsck: add stress tests for fsck.skipList
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 8f42a999d90c879dada0812b8f560fd989f91d2a..113c1d69625935a2f3c476af0ec0ca92201417e7 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-8,6
+8,7
@@
#include "advice.h"
#include "lockfile.h"
#include "cache-tree.h"
+#include "object-store.h"
#include "commit.h"
#include "blob.h"
#include "builtin.h"