builtin-merge: release the lockfile in try_merge_strategy()

diff --git a/Makefile b/Makefile
index 20f028fffff314da453774fd50d0e99259d01f2c..f69761838465b848337f62eb90ab9fe94777fa9f 100644 (file)
--- 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