We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
maxConflicts
1 parent 7269495 commit f28b356Copy full SHA for f28b356
users/config.rst
@@ -503,8 +503,8 @@ The following child elements may exist:
503
.. option:: folder.maxConflicts
504
505
The maximum number of conflict copies to keep around for any given file.
506
- The default, ``-1``, means an unlimited number. Setting this to ``0`` disables
507
- conflict copies altogether.
+ The default is ``10``. ``-1``, means an unlimited number.
+ Setting this to ``0`` disables conflict copies altogether.
508
509
.. option:: folder.disableSparseFiles
510
0 commit comments