Which merge_file() function do you mean?

[thirdparty/git.git] / Makefile

diff --git a/Makefile b/Makefile
index 4ad6fbd64e5cea1ff833f142ec0072566039bc49..26ec5190806796e3c24aa8464c8de9c2bc51fc23 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -765,7 +765,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