Be more user-friendly when refusing to do something because of conflict.

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a1e36d7e423e01de796ac5f866536280618199d1..9c27686fab2c813139bb64642e48aad3d5ba6a80 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.
 --
 
 core.fileMode::