Merge branch 'jk/notes-merge-from-anywhere'

diff --git a/git-compat-util.h b/git-compat-util.h
index 2da0a75a380da198bd65fe3d9b0c95ef98a0b4aa..e8f286722864e13e8d5e1ad1e7380c586e505320 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -733,6 +733,7 @@ extern int xmkstemp_mode(char *template, int mode);
 extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
 extern int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1);
 extern char *xgetcwd(void);
+extern FILE *fopen_for_writing(const char *path);
 
 #define REALLOC_ARRAY(x, alloc) (x) = xrealloc((x), (alloc) * sizeof(*(x)))