merge-blobs.hon commit config.c: handle lock file in error case in git_config_rename_... (c06fa62)
   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 */