aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-11 18:34:24 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-11 18:34:24 -0800
commitc566ea13fd25be8a7c20bdf3644d1ebe3f65b690 (patch)
tree90662464e689e56c23333d0041cdce7974e16a77 /Makefile
parent98294e9875c05cdf2d4f16d446cb89ba6d41014a (diff)
parent35ffe7583108ab236dcf81226690388491d9962f (diff)
downloadgit-c566ea13fd25be8a7c20bdf3644d1ebe3f65b690.tar.gz
git-c566ea13fd25be8a7c20bdf3644d1ebe3f65b690.tar.xz
Merge branch 'jc/merge-blobs'
Update the disused merge-tree proof-of-concept code. * jc/merge-blobs: merge-tree: fix d/f conflicts merge-tree: add comments to clarify what these functions are doing merge-tree: lose unused "resolve_directories" merge-tree: lose unused "flags" from merge_list Which merge_file() function do you mean?
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 029bf39c9..1b30d7bde 100644
--- a/Makefile
+++ b/Makefile
@@ -766,7 +766,7 @@ LIB_OBJS += log-tree.o
LIB_OBJS += mailmap.o
LIB_OBJS += match-trees.o
LIB_OBJS += merge.o
-LIB_OBJS += merge-file.o
+LIB_OBJS += merge-blobs.o
LIB_OBJS += merge-recursive.o
LIB_OBJS += mergesort.o
LIB_OBJS += name-hash.o