Skip to content

Commit a60521b

Browse files
Ramsay Jonesgitster
authored andcommitted
Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
Commit fa2364e ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 35ffe75 commit a60521b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ LIB_H += list-objects.h
649649
LIB_H += ll-merge.h
650650
LIB_H += log-tree.h
651651
LIB_H += mailmap.h
652-
LIB_H += merge-file.h
652+
LIB_H += merge-blobs.h
653653
LIB_H += merge-recursive.h
654654
LIB_H += mergesort.h
655655
LIB_H += notes-cache.h

0 commit comments

Comments
 (0)