Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
[gitweb.git]
/
notes-merge.c
diff --git
a/notes-merge.c
b/notes-merge.c
index d613e06574aec31e0ecaf083b489b0465e5c27f1..9cc2ee16a8c04c43dabebd61b0b7d41627af40ee 100644
(file)
--- a/
notes-merge.c
+++ b/
notes-merge.c
@@
-1,6
+1,7
@@
#include "cache.h"
#include "commit.h"
#include "refs.h"
+#include "object-store.h"
#include "diff.h"
#include "diffcore.h"
#include "xdiff-interface.h"