Merge branch 'jt/fetch-nego-tip' into ab/fetch-nego

diff --git a/Makefile b/Makefile
index 96f84d1dcf8a8618f6aae124fce0025f41132a8d..617475622b98dba1c5b44c33f8add65b41feb6ca 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