Merge branch 'jc/diff' into next

diff --git a/Makefile b/Makefile
index 25b99e62d1c891fe9d1185eb3cc7648fe811835a..c1778560ee2999a8276d904d639ff783a78d1784 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -199,7 +199,7 @@ LIB_H = \
        tree-walk.h log-tree.h
 
 DIFF_OBJS = \
-       diff-lib.o diffcore-break.o diffcore-order.o \
+       diff.o diff-lib.o diffcore-break.o diffcore-order.o \
        diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
        diffcore-delta.o log-tree.o