Merge branch 'jc/diff' into next

diff --git a/Makefile b/Makefile
index 576067fafbd9fab97fa555ef7272d88e6a580892..895e6a1e4a7bc8a903b615f5852abbea862b403c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -214,7 +214,7 @@ LIB_OBJS = \
        $(DIFF_OBJS)
 
 BUILTIN_OBJS = \
-       builtin-log.o builtin-help.o builtin-count.o
+       builtin-log.o builtin-help.o builtin-count.o builtin-diff.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz