* [PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
@ 2013-01-22 16:47 Ramsay Jones
2013-01-22 18:48 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Ramsay Jones @ 2013-01-22 16:47 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GIT Mailing-list
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>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 1b30d7b..a786d4c 100644
--- 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
--
1.8.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
2013-01-22 16:47 [PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H Ramsay Jones
@ 2013-01-22 18:48 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2013-01-22 18:48 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Git Mailing-list
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-22 18:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-22 16:47 [PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H Ramsay Jones
2013-01-22 18:48 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).