diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2013-01-22 16:47:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-22 18:47:47 (GMT) |
| commit | a60521bc6099ce89d05ef2160d2e3c30a106fda7 (patch) | |
| tree | 6bf5597718795107e441c3132320d46f1f1711f1 /Makefile | |
| parent | 35ffe7583108ab236dcf81226690388491d9962f (diff) | |
| download | git-a60521bc6099ce89d05ef2160d2e3c30a106fda7.zip git-a60521bc6099ce89d05ef2160d2e3c30a106fda7.tar.gz git-a60521bc6099ce89d05ef2160d2e3c30a106fda7.tar.bz2 | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |