Merge branch 'jh/notes-merge'

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 7eb948d7c8a591139f8f3bb050fb051e53fefa5a..91567c651ef902b100976e0f1912e4d878cac7aa 100644 (file)
--- 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