merge-blobs.hon commit Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax (ff65e79)
   1#ifndef MERGE_BLOBS_H
   2#define MERGE_BLOBS_H
   3
   4#include "blob.h"
   5
   6extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
   7
   8#endif /* MERGE_BLOBS_H */