X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile;h=858e58ddd2248fe4299d88759daa204ce3678fa0;hb=55436162c72c07b51d4a2008ed1177733fbf0a95;hp=f0be83b296f0e480a529f6af96699b46bf75bece;hpb=d3d9681a0fc23a47d48b5df296cd267b0b6055b2;p=git.git

diff --git a/Makefile b/Makefile
index f0be83b2..858e58dd 100644
--- a/Makefile
+++ b/Makefile
@@ -165,7 +165,8 @@ PROGRAMS = \
 	git-upload-pack$X git-verify-pack$X git-write-tree$X \
 	git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
 	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
-	git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
+	git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \
+	git-unresolve$X
 
 BUILT_INS = git-log$X
 
@@ -199,7 +200,7 @@ LIB_H = \
 	tree-walk.h log-tree.h
 
 DIFF_OBJS = \
-	diff.o diffcore-break.o diffcore-order.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