aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-08-12 18:45:14 +0200
committerJunio C Hamano <gitster@pobox.com>2008-08-30 20:46:54 -0700
commit9047ebbc229bf5b99d6c7522293b8cbd1100b747 (patch)
treed5524f2922348d8c7b3b7b3506e32611edc25188 /Makefile
parent7df437e56b5a2c5ec7140dd097b517563db4972c (diff)
downloadgit-9047ebbc229bf5b99d6c7522293b8cbd1100b747.tar.gz
git-9047ebbc229bf5b99d6c7522293b8cbd1100b747.tar.xz
Split out merge_recursive() to merge-recursive.c
Move most of the of code from builtin-merge-recursive.c to a new file merge-recursive.c and introduce merge_recursive_setup() in there so that builtin-merge-recursive and other builtins call it. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 20f028fff..f69761838 100644
--- a/Makefile
+++ b/Makefile
@@ -440,6 +440,7 @@ LIB_OBJS += log-tree.o
LIB_OBJS += mailmap.o
LIB_OBJS += match-trees.o
LIB_OBJS += merge-file.o
+LIB_OBJS += merge-recursive.o
LIB_OBJS += name-hash.o
LIB_OBJS += object.o
LIB_OBJS += pack-check.o