Merge branch 'jm/mem-pool' into next

diff --git a/Makefile b/Makefile
index 82b1e644c4c9dfaf6094333ad82b9ff1adff3fa6..7dcb37c18fc873ca8f4ee081134bd2b666ebd68f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -841,6 +841,7 @@ LIB_OBJS += log-tree.o
 LIB_OBJS += ls-refs.o
 LIB_OBJS += mailinfo.o
 LIB_OBJS += mailmap.o
+LIB_OBJS += mem-pool.o
 LIB_OBJS += match-trees.o
 LIB_OBJS += merge.o
 LIB_OBJS += merge-blobs.o