Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
Commit fa2364ec ("Which merge_file() function do you mean?", 06-12-2012) renamed the files merge-file.[ch] to merge-blobs.[ch], but forgot to rename the header file in the definition of the LIB_H macro. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones committed
Jan 22, 2013 at 16:47 UTC
a60521bc6099ce89d05ef2160d2e3c30a106fda7
1 file changed
+1
-1
Makefile
+1
-1
@@ -649,7 +649,7 @@ LIB_H += list-objects.h
649
LIB_H += ll-merge.h
650
LIB_H += log-tree.h
651
LIB_H += mailmap.h
652
-LIB_H += merge-file.h
652
+LIB_H += merge-blobs.h
653
LIB_H += merge-recursive.h
654
LIB_H += mergesort.h
655
LIB_H += notes-cache.h