From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Tue, 22 Jan 2013 16:47:47 +0000 (+0000)
Subject: Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
X-Git-Tag: v1.8.1.3~15^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a60521bc6099ce89d05ef2160d2e3c30a106fda7;p=thirdparty%2Fgit.git

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>
---

diff --git a/Makefile b/Makefile
index 26ec519080..5d00304dcd 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