зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
35ffe75831
Коммит
a60521bc60
2
Makefile
2
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
|
||||
|
|
Загрузка…
Ссылка в новой задаче