X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile;h=91567c651ef902b100976e0f1912e4d878cac7aa;hb=657072f3ac5519f146a947253c9959909b38c293;hp=7eb948d7c8a591139f8f3bb050fb051e53fefa5a;hpb=f04aa35eb6117d99f5abf9630961b2c2651d3ed1;p=git.git

diff --git a/Makefile b/Makefile
index 7eb948d7c..91567c651 100644
--- a/Makefile
+++ b/Makefile
@@ -525,6 +525,7 @@ LIB_H += mailmap.h
 LIB_H += merge-recursive.h
 LIB_H += notes.h
 LIB_H += notes-cache.h
+LIB_H += notes-merge.h
 LIB_H += object.h
 LIB_H += pack.h
 LIB_H += pack-refs.h
@@ -615,6 +616,7 @@ LIB_OBJS += merge-recursive.o
 LIB_OBJS += name-hash.o
 LIB_OBJS += notes.o
 LIB_OBJS += notes-cache.o
+LIB_OBJS += notes-merge.o
 LIB_OBJS += object.o
 LIB_OBJS += pack-check.o
 LIB_OBJS += pack-refs.o