[PATCH] Update renamed file merge-file.h in Makefile

From: Jiang Xin <worldhello.net@gmail.com>
Date: Jan 25, 2013, 03:06 UTC
Message-ID: <1359083188-31866-1-git-send-email-worldhello.net@gmail.com>

Commit v1.8.1-rc0-3-gfa2364e renamed merge-file.h to merge-blobs.h, but forgot to update the reference of merge-file.h in Makefile. This would break the build of "po/git.pot", which depends on $(LOCALIZED_C), then fallback to the missing file "merge-file.h".

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 Makefile |    2 +-
 1 个文件被修改，插入 1 行(+)，删除 1 行(-)

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