git notes merge: Add automatic conflict resolvers (ours, theirs, union)

diff --git a/notes-merge.h b/notes-merge.h
index 577cfb33cdb1f2a830d8a8aa793723df8d7f76aa..ed356ae3af8097395acd3e4141b04af22dce792e 100644 (file)
--- a/notes-merge.h
+++ b/notes-merge.h
@@ -11,6 +11,12 @@ struct notes_merge_options {
        const char *remote_ref;
        const char *commit_msg;
        int verbosity;
+       enum {
+               NOTES_MERGE_RESOLVE_MANUAL = 0,
+               NOTES_MERGE_RESOLVE_OURS,
+               NOTES_MERGE_RESOLVE_THEIRS,
+               NOTES_MERGE_RESOLVE_UNION
+       } strategy;
 };
 
 void init_notes_merge_options(struct notes_merge_options *o);