aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-09-25 09:49:19 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-09-25 09:49:19 -0700
commited520a8f270253f4a779aece1352b10fb9a689de (patch)
treed4e6f8d587781821b9d642ef23c7d60abaa2068e /Makefile
parent1ad6d46235d135582d5cbb91ec0186b485c7b5c1 (diff)
parent4271666046b4b3e655eab88821096539099f3b14 (diff)
downloadgit-ed520a8f270253f4a779aece1352b10fb9a689de.tar.gz
git-ed520a8f270253f4a779aece1352b10fb9a689de.tar.xz
Merge branch 'mv/merge-recursive'
* mv/merge-recursive: builtin-merge: release the lockfile in try_merge_strategy() merge-recursive: get rid of virtual_id merge-recursive: move current_{file,directory}_set to struct merge_options merge-recursive: move the global obuf to struct merge_options merge-recursive: get rid of the index_only global variable merge-recursive: move call_depth to struct merge_options cherry-pick/revert: make direct internal call to merge_tree() builtin-merge: avoid run_command_v_opt() for recursive and subtree merge-recursive: introduce merge_options merge-recursive.c: Add more generic merge_recursive_generic() Split out merge_recursive() to merge-recursive.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 48547a211..e0c03c3ee 100644
--- a/Makefile
+++ b/Makefile
@@ -443,6 +443,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