Merge branch 'jc/makefile-perl-python-path-doc'

diff --git a/Makefile b/Makefile
index 1695075992217cf050ab2eff6fa1e37b5e71be05..fd635acb2e4f05672e899129ae483ee421a59e2d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -654,7 +654,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