Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
object-store: move object access functions to object-store.h
[gitweb.git]
/
builtin
/
merge-tree.c
diff --git
a/builtin/merge-tree.c
b/builtin/merge-tree.c
index 32736e0b1011f575d2585fd2e012501d807f9e9b..1b702d44c9fd0155e8117e46974eb2f4468afbee 100644
(file)
--- a/
builtin/merge-tree.c
+++ b/
builtin/merge-tree.c
@@
-1,6
+1,7
@@
#include "builtin.h"
#include "tree-walk.h"
#include "xdiff-interface.h"
+#include "object-store.h"
#include "blob.h"
#include "exec_cmd.h"
#include "merge-blobs.h"