Move try_merge_command and checkout_fast_forward to libgit.a

[git/git.git] / Makefile

diff --git a/Makefile b/Makefile
index 40829a9..0877f40 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -763,6 +763,7 @@ LIB_OBJS += lockfile.o
 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-recursive.o
 LIB_OBJS += mergesort.o