contrib/subtree: Make testing easier

diff --git a/notes-utils.c b/notes-utils.c
index ccbf0737a34e466d39b2084c8a6d258b8235d8f6..299e34bccc5893529cb5db1abe061529304e6074 100644 (file)
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -54,6 +54,24 @@ void commit_notes(struct notes_tree *t, const char *msg)
        strbuf_release(&buf);
 }
 
+int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s)
+{
+       if (!strcmp(v, "manual"))
+               *s = NOTES_MERGE_RESOLVE_MANUAL;
+       else if (!strcmp(v, "ours"))
+               *s = NOTES_MERGE_RESOLVE_OURS;
+       else if (!strcmp(v, "theirs"))
+               *s = NOTES_MERGE_RESOLVE_THEIRS;
+       else if (!strcmp(v, "union"))
+               *s = NOTES_MERGE_RESOLVE_UNION;
+       else if (!strcmp(v, "cat_sort_uniq"))
+               *s = NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ;
+       else
+               return -1;
+
+       return 0;
+}
+
 static combine_notes_fn parse_combine_notes_fn(const char *v)
 {
        if (!strcasecmp(v, "overwrite"))