diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-04 10:03:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-04 10:03:41 -0800 |
| commit | 686b895928efcd577b541f589a016fc0182f3a2f (patch) | |
| tree | c44ca0825de99786cd7356217b321b35f3a51c70 /test-sha1.c | |
| parent | 2173205f5c6e0e87c282cf94c13c8a41935cb1a2 (diff) | |
| parent | a60521bc6099ce89d05ef2160d2e3c30a106fda7 (diff) | |
| download | git-686b895928efcd577b541f589a016fc0182f3a2f.tar.gz | |
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 'test-sha1.c')
0 files changed, 0 insertions, 0 deletions