Andrew's git / gitweb.git / diff
?
Merge branch 'jc/merge-blobs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 18:48:20 +0000 (10:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 18:48:20 +0000 (10:48 -0800)
* jc/merge-blobs:
Makefile: Replace merge-file.h with merge-blobs.h in LIB_H

Makefile patch | blob | history
diff --git a/Makefile b/Makefile
index 1b30d7bde301305cde0d3af74c7e478e36bd673b..a786d4ce7a133878c51904dcb723b3f9fa9ca5d4 100644 (file)
--- 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