mergetool: do not enable hideResolved by default

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

diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index 90f76f5b9ba8ddd82ecc4ef3f89185f8e8298f23..cafbbef46ae9c102e9e175e67282badb67e09255 100644 (file)
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -53,7 +53,7 @@ mergetool.hideResolved::
        resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so
        that only the unresolved conflicts are presented to the merge tool. Can
        be configured per-tool via the `mergetool.<tool>.hideResolved`
-       configuration variable. Defaults to `true`.
+       configuration variable. Defaults to `false`.
 
 mergetool.keepBackup::
        After performing a merge, the original file with conflict markers