{"thread":{"id":"32694","subject":"[PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H","startedAt":"2013-01-22T16:47:47Z","lastAt":"2013-01-22T18:48:53Z","messageCount":2,"participants":["Ramsay Jones","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"207518","messageId":"50FEC2B3.3010000@ramsay1.demon.co.uk","threadId":"32694","inReplyTo":null,"subject":"[PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2013-01-22T16:47:47Z","receivedAt":"2013-01-22T16:47:47Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nCommit fa2364ec (\"Which merge_file() function do you mean?\", 06-12-2012)\nrenamed the files merge-file.[ch] to merge-blobs.[ch], but forgot to\nrename the header file in the definition of the LIB_H macro.\n\nSigned-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n---\n Makefile | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Makefile b/Makefile\nindex 1b30d7b..a786d4c 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -649,7 +649,7 @@ LIB_H += list-objects.h\n LIB_H += ll-merge.h\n LIB_H += log-tree.h\n LIB_H += mailmap.h\n-LIB_H += merge-file.h\n+LIB_H += merge-blobs.h\n LIB_H += merge-recursive.h\n LIB_H += mergesort.h\n LIB_H += notes-cache.h\n-- \n1.8.1\n"},{"id":"207521","messageId":"7vwqv58356.fsf@alter.siamese.dyndns.org","threadId":"32694","inReplyTo":"50FEC2B3.3010000@ramsay1.demon.co.uk","subject":"Re: [PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-22T18:48:53Z","receivedAt":"2013-01-22T18:48:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}