# [PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H

2 messages from 2013-01-22 to 2013-01-22. Participants: Ramsay Jones, Junio C Hamano.
Thread: https://gitlist.dev/t/32694

## Ramsay Jones, 2013-01-22 16:47

Subject: [PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
Message-ID: <50FEC2B3.3010000@ramsay1.demon.co.uk>
URL: https://gitlist.dev/e/50FEC2B3.3010000%40ramsay1.demon.co.uk

```

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

```

## Junio C Hamano, 2013-01-22 18:48

Subject: Re: [PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
Message-ID: <7vwqv58356.fsf@alter.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vwqv58356.fsf%40alter.siamese.dyndns.org
In-Reply-To: <50FEC2B3.3010000@ramsay1.demon.co.uk>

```
Thanks.

```
