sequencer: allow disabling conflict advice

[thirdparty/git.git] / Documentation / config / advice.txt

diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index f83341165367baac4f02779eedf432822644e615..0e35ae5240fa523039524b52aaeccd41e62820ac 100644 (file)
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -56,6 +56,8 @@ advice.*::
                Shown when the user's information is guessed from the
                system username and domain name, to tell the user how to
                set their identity configuration.
+       mergeConflict::
+               Shown when various commands stop because of conflicts.
        nestedTag::
                Shown when a user attempts to recursively tag a tag object.
        pushAlreadyExists::