diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-04 18:03:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-04 18:03:41 (GMT) |
| commit | 686b895928efcd577b541f589a016fc0182f3a2f (patch) | |
| tree | c44ca0825de99786cd7356217b321b35f3a51c70 /Makefile | |
| parent | 2173205f5c6e0e87c282cf94c13c8a41935cb1a2 (diff) | |
| parent | a60521bc6099ce89d05ef2160d2e3c30a106fda7 (diff) | |
| download | git-686b895928efcd577b541f589a016fc0182f3a2f.zip git-686b895928efcd577b541f589a016fc0182f3a2f.tar.gz git-686b895928efcd577b541f589a016fc0182f3a2f.tar.bz2 | |
Merge branch 'jc/merge-blobs' into maint
* jc/merge-blobs:
Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
merge-tree: fix d/f conflicts
merge-tree: add comments to clarify what these functions are doing
merge-tree: lose unused "resolve_directories"
merge-tree: lose unused "flags" from merge_list
Which merge_file() function do you mean?
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -653,7 +653,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 @@ -769,7 +769,7 @@ LIB_OBJS += log-tree.o LIB_OBJS += mailmap.o LIB_OBJS += match-trees.o LIB_OBJS += merge.o -LIB_OBJS += merge-file.o +LIB_OBJS += merge-blobs.o LIB_OBJS += merge-recursive.o LIB_OBJS += mergesort.o LIB_OBJS += name-hash.o |