Merge part of 'jc/diff' into next

diff --git a/Makefile b/Makefile
index 26ef1f81044caccaab2cee96d7facdf3b9e2df83..db07d4d451f769bb855e58c12ce64cb403e08c63 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,8 @@ LIB_H = \
 
 DIFF_OBJS = \
        diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
-       diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o
+       diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
+       diffcore-delta.o
 
 LIB_OBJS = \
        blob.o commit.o connect.o count-delta.o csum-file.o \