Move setup_diff_pager to libgit.a

diff --git a/Makefile b/Makefile
index 40829a9e994ef57e07bdcc16f0c6c8fd137f01fc..0877f4091d7653287f4b9956805aef3890686425 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