Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows

[git] / merge-blobs.h

#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 */