Merge branch 'ao/t9001-fix'

[thirdparty/git.git] / notes-merge.h

diff --git a/notes-merge.h b/notes-merge.h
index 195222f9dad9c245c152eef1871f579dc470f6f4..168a6724cd873602e3da1ff3b7e2cc67a5b240ae 100644 (file)
--- 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;
 };