Andrew's git / gitweb.git / merge-blobs.h
?
merge-blobs.hon commit merge: remove drop_save() in favor of remove_merge_branch_state() (b643355)
   1#ifndef MERGE_BLOBS_H
   2#define MERGE_BLOBS_H
   3
   4struct blob;
   5struct index_state;
   6
   7extern void *merge_blobs(struct index_state *, const char *,
   8                         struct blob *, struct blob *,
   9                         struct blob *, unsigned long *);
  10
  11#endif /* MERGE_BLOBS_H */