diff options
Diffstat (limited to 'notes-merge.h')
| -rw-r--r-- | notes-merge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/notes-merge.h b/notes-merge.h index 195222f9d..168a6724c 100644 --- a/notes-merge.h +++ b/notes-merge.h @@ -17,7 +17,8 @@ struct notes_merge_options { 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; }; |