summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-22 10:48:20 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-22 10:48:20 -0800
commit9591fcc6d66fd213c8c9f73553b7684b73daf4cb (patch)
tree8dd432bdf7821f0a86349628f148fed232acc995 /Makefile
parentc4ada6283eaf1d4970b92b0e2cb9503a17da27ad (diff)
parenta60521bc6099ce89d05ef2160d2e3c30a106fda7 (diff)
downloadgit-9591fcc6d66fd213c8c9f73553b7684b73daf4cb.tar.gz
Merge branch 'jc/merge-blobs'
* jc/merge-blobs: Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1b30d7bde3..a786d4ce7a 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