Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
alloc: allow arbitrary repositories for alloc functions
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 6dac890864882744d3936391bbe5067a23411af3..cbded673c282fd888f239202878ad452e18a3cdf 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-15,6
+15,7
@@
#include "diff.h"
#include "diffcore.h"
#include "tag.h"
+#include "alloc.h"
#include "unpack-trees.h"
#include "string-list.h"
#include "xdiff-interface.h"