Merge branch 'mm/conflict-advice'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d4332140a01635feab079e394f02d8c927cf37c5..76c7d9c7e53b1e8b5c688870a6d2dba840787b54 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -130,6 +130,10 @@ advice.*::
                Advice shown when linkgit:git-merge[1] refuses to
                merge to avoid overwritting local changes.
                Default: true.
+       resolveConflict::
+               Advices shown by various commands when conflicts
+               prevent the operation from being performed.
+               Default: true.
        implicitIdentity::
                Advice on how to set your identity configuration when
                your information is guessed from the system username and