merge-recursive: handle addition of submodule on our side of history

diff --git a/Makefile b/Makefile
index b143e4eea3fa75eebd883361c40c3faa9e6c8060..cd75985991f4535c45e2589222a9e6a38fb1d613 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -824,6 +824,7 @@ LIB_OBJS += notes-cache.o
 LIB_OBJS += notes-merge.o
 LIB_OBJS += notes-utils.o
 LIB_OBJS += object.o
+LIB_OBJS += oidmap.o
 LIB_OBJS += oidset.o
 LIB_OBJS += packfile.o
 LIB_OBJS += pack-bitmap.o