Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ds/reachable'
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index e5243dbc542d786a645a9c038c855a6ca30acaba..d9d78ec3832c54cae373e9fb688d5153e66830e2 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-27,6
+27,7
@@
#include "dir.h"
#include "submodule.h"
#include "revision.h"
+#include "commit-reach.h"
struct path_hashmap_entry {
struct hashmap_entry e;