Start the 2.46 cycle

[thirdparty/git.git] / advice.c

diff --git a/advice.c b/advice.c
index a18bfe776f609d6340d9620c32ff5cdbef81d341..75111191ad586d4cbae07e806f8b2bb6f7ebe83b 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -57,6 +57,7 @@ static struct {
        [ADVICE_GRAFT_FILE_DEPRECATED]                  = { "graftFileDeprecated" },
        [ADVICE_IGNORED_HOOK]                           = { "ignoredHook" },
        [ADVICE_IMPLICIT_IDENTITY]                      = { "implicitIdentity" },
+       [ADVICE_MERGE_CONFLICT]                         = { "mergeConflict" },
        [ADVICE_NESTED_TAG]                             = { "nestedTag" },
        [ADVICE_OBJECT_NAME_WARNING]                    = { "objectNameWarning" },
        [ADVICE_PUSH_ALREADY_EXISTS]                    = { "pushAlreadyExists" },