X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=notes-utils.h;h=fa538e1d9502c07fb1d72901c5939cd276fa1722;hb=93efcad31777142840eaefc19b71d1a4b6a2fe24;hp=db5811e3f718e0dce7bc31e92cd05e481fe4376a;hpb=4d03dd18f0860d4052fab5ce7779e4bba302e5fc;p=thirdparty%2Fgit.git

diff --git a/notes-utils.h b/notes-utils.h
index db5811e3f7..fa538e1d95 100644
--- a/notes-utils.h
+++ b/notes-utils.h
@@ -37,6 +37,7 @@ struct notes_rewrite_cfg {
 	int mode_from_env;
 };
 
+int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s);
 struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
 int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
 			  const unsigned char *from_obj, const unsigned char *to_obj);