Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
[gitweb.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 26ec5190806796e3c24aa8464c8de9c2bc51fc23..5d00304dcdbfa9a943420ed55b12ee446821551c 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