summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-26 06:12:21 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-26 06:12:21 (GMT)
commite9b5b75ca87f45292de8ecde5d4d0512ac9542cd (patch)
treebe4cc0707c97c8bbd2dc4699f646f886fe2739a9 /Makefile
parent71459c193d04870076efa0a387c317390b53e3e2 (diff)
parent5c21ac0e7c475c82039ab604ee9d7d8430889346 (diff)
downloadgit-e9b5b75ca87f45292de8ecde5d4d0512ac9542cd.zip
git-e9b5b75ca87f45292de8ecde5d4d0512ac9542cd.tar.gz
git-e9b5b75ca87f45292de8ecde5d4d0512ac9542cd.tar.bz2
Merge branch 'jc/diff'
* jc/diff: Libified diff-index: backward compatibility fix. Libify diff-index. Libify diff-files.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 809383c..087ff27 100644
--- 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