xdl_merge(): fix a segmentation fault when refining conflicts

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 775ffaac27d7382df9db84d226603854295045d6..544385f3e38727ab59b531978d63aaf5ee119712 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -250,8 +250,7 @@ LIB_OBJS = \
        revision.o pager.o tree-walk.o xdiff-interface.o \
        write_or_die.o trace.o list-objects.o grep.o \
        alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
-       color.o wt-status.o archive-zip.o archive-tar.o \
-       utf8.o
+       color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o
 
 BUILTIN_OBJS = \
        builtin-add.o \