Merge branch 'jc/merge-blobs'

diff --git a/Makefile b/Makefile
index 1b30d7bde301305cde0d3af74c7e478e36bd673b..a786d4ce7a133878c51904dcb723b3f9fa9ca5d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -649,7 +649,7 @@ LIB_H += list-objects.h
 LIB_H += ll-merge.h
 LIB_H += log-tree.h
 LIB_H += mailmap.h
-LIB_H += merge-file.h
+LIB_H += merge-blobs.h
 LIB_H += merge-recursive.h
 LIB_H += mergesort.h
 LIB_H += notes-cache.h