Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Docs: send-email: Create logical groupings for --help text
[gitweb.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 48547a21139e7c22ebc96fc19ee7cd1f6b3116bb..e0c03c3eecc26d995f8829429092e887df17489f 100644
(file)
--- 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