diff --git a/notes-merge.h b/notes-merge.h
index aa756931a5720aab8526e4c9ba746113783b50ae..168a6724cd873602e3da1ff3b7e2cc67a5b240ae 100644 (file)
--- a/notes-merge.h
+++ b/notes-merge.h
struct notes_merge_options {
const char *local_ref;
const char *remote_ref;
- const char *commit_msg;
+ struct strbuf commit_msg;
int verbosity;
enum {
NOTES_MERGE_RESOLVE_MANUAL = 0,
NOTES_MERGE_RESOLVE_OURS,
NOTES_MERGE_RESOLVE_THEIRS,
- NOTES_MERGE_RESOLVE_UNION
+ NOTES_MERGE_RESOLVE_UNION,
+ NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ
} strategy;
unsigned has_worktree:1;
};