ll-merge: let caller decide whether to renormalize

diff --git a/builtin/notes.c b/builtin/notes.c
index 648033c27e75e9a19e9fd3a2fa21b2e26b19d5ac..f1f53a80e188327c0da21b046f0e8879caabc6af 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -313,7 +313,7 @@ int commit_notes(struct notes_tree *t, const char *msg)
        return 0;
 }
 
-combine_notes_fn *parse_combine_notes_fn(const char *v)
+combine_notes_fn parse_combine_notes_fn(const char *v)
 {
        if (!strcasecmp(v, "overwrite"))
                return combine_notes_overwrite;