Start the 2.46 cycle

[thirdparty/git.git] / advice.h

diff --git a/advice.h b/advice.h
index bf630ee3ac3eae23b05b9554f4cc20ce2ea7a280..c8d29f97f39bef84062d541009a27bd35a47f9dd 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -25,6 +25,7 @@ enum advice_type {
        ADVICE_GRAFT_FILE_DEPRECATED,
        ADVICE_IGNORED_HOOK,
        ADVICE_IMPLICIT_IDENTITY,
+       ADVICE_MERGE_CONFLICT,
        ADVICE_NESTED_TAG,
        ADVICE_OBJECT_NAME_WARNING,
        ADVICE_PUSH_ALREADY_EXISTS,