Merge branch 'jn/thinner-wrapper'

diff --git a/Makefile b/Makefile
index 29ebe70599aa9c01ddb84e5611ac08d441adef4c..7a5fb699d193d95c763cc310d8b6b944d1aa4119 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -670,6 +670,7 @@ LIB_OBJS += write_or_die.o
 LIB_OBJS += ws.o
 LIB_OBJS += wt-status.o
 LIB_OBJS += xdiff-interface.o
+LIB_OBJS += zlib.o
 
 BUILTIN_OBJS += builtin/add.o
 BUILTIN_OBJS += builtin/annotate.o