diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-11 18:34:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-11 18:34:24 -0800 |
| commit | c566ea13fd25be8a7c20bdf3644d1ebe3f65b690 (patch) | |
| tree | 90662464e689e56c23333d0041cdce7974e16a77 /merge-blobs.h | |
| parent | Merge branch 'jc/format-patch-reroll' (diff) | |
| parent | merge-tree: fix d/f conflicts (diff) | |
| download | git-c566ea13fd25be8a7c20bdf3644d1ebe3f65b690.tar.gz git-c566ea13fd25be8a7c20bdf3644d1ebe3f65b690.zip | |
Merge branch 'jc/merge-blobs'
Update the disused merge-tree proof-of-concept code.
* jc/merge-blobs:
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 'merge-blobs.h')
| -rw-r--r-- | merge-blobs.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/merge-blobs.h b/merge-blobs.h new file mode 100644 index 0000000000..62b569e472 --- /dev/null +++ b/merge-blobs.h @@ -0,0 +1,8 @@ +#ifndef MERGE_BLOBS_H +#define MERGE_BLOBS_H + +#include "blob.h" + +extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *); + +#endif /* MERGE_BLOBS_H */ |