aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-12 22:31:22 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-12 22:31:22 -0700
commit096b1732343305b7096b1085c23eba8cd83569c7 (patch)
treec50b023920773dbd284d949ee978bd0bee05df94 /Makefile
parente918c6abac65fb56b381f37cc139753fbe6768a3 (diff)
parent0c7993839b92f466278439a724023f8be50391c1 (diff)
downloadgit-096b1732343305b7096b1085c23eba8cd83569c7.tar.gz
git-096b1732343305b7096b1085c23eba8cd83569c7.tar.xz
Merge branch 'lt/merge-tree'
* lt/merge-tree: Improved three-way blob merging code Prepare "git-merge-tree" for future work xdiff: generate "anti-diffs" aka what is common to two files
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e75fb133a..649ed4cdc 100644
--- a/Makefile
+++ b/Makefile
@@ -222,7 +222,7 @@ LIB_OBJS = \
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 xdiff-interface.o \
- alloc.o $(DIFF_OBJS)
+ alloc.o merge-file.o $(DIFF_OBJS)
BUILTIN_OBJS = \
builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \