Merge branch 'master' into jc/diff

diff --git a/Makefile b/Makefile
index b2721469a70bacd7c0637aa8f1bd36ec57e18355..34a8c14d551c7dd5cf49fd593cb4d12f72d1f6e9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ LIB_H = \
        tree-walk.h log-tree.h
 
 DIFF_OBJS = \
-       diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
+       diff.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