projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 35ffe75) | patch
Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>
Tue, 22 Jan 2013 16:47:47 +0000 (16:47 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 18:47:47 +0000 (10:47 -0800)
commita60521bc6099ce89d05ef2160d2e3c30a106fda7
tree6bf5597718795107e441c3132320d46f1f1711f1tree | snapshot
parent35ffe7583108ab236dcf81226690388491d9962fcommit | diff
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>
Makefile diff | blob | history
Git—the stupid content tracker