summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-05 09:03:58 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-05 09:09:58 (GMT)
commitd9ea73e0564c7db8d791fe6b03c976ce57c9b079 (patch)
tree1440a434f16a356f31f5c00029fafecd7a5664ea /Makefile
parentf23fc773a2acce9966ac7fa267818d5be55667fa (diff)
downloadgit-d9ea73e0564c7db8d791fe6b03c976ce57c9b079.zip
git-d9ea73e0564c7db8d791fe6b03c976ce57c9b079.tar.gz
git-d9ea73e0564c7db8d791fe6b03c976ce57c9b079.tar.bz2
combine-diff: refactor built-in xdiff interface.
This refactors the line-by-line callback mechanism used in combine-diff so that other programs can reuse it more easily. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 145099a..7030370 100644
--- a/Makefile
+++ b/Makefile
@@ -208,7 +208,7 @@ LIB_OBJS = \
quote.o read-cache.o refs.o run-command.o \
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
- fetch-clone.o revision.o pager.o tree-walk.o \
+ fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
$(DIFF_OBJS)
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)