Merge branch 'jt/fetch-negotiator-skipping'

diff --git a/Makefile b/Makefile
index ab5f6037980bfdd92a077f4c196144684da305fe..74588d3ddaa0d1dd8365bbf441845db4f08cb166 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -893,6 +893,7 @@ LIB_OBJS += merge-recursive.o
 LIB_OBJS += mergesort.o
 LIB_OBJS += name-hash.o
 LIB_OBJS += negotiator/default.o
+LIB_OBJS += negotiator/skipping.o
 LIB_OBJS += notes.o
 LIB_OBJS += notes-cache.o
 LIB_OBJS += notes-merge.o