Merge branch 'ew/daemon-socket-keepalive' into maint

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 002ca58c21e2f653ffd5651a8aedfe865400e166..df3ea3779be369ce0f935cfac945e79f08ff4b5a 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -61,7 +61,7 @@ merge.verbosity::
        message if conflicts were detected. Level 1 outputs only
        conflicts, 2 outputs conflicts and file changes.  Level 5 and
        above outputs debugging information.  The default is level 2.
-       Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable.
+       Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable.
 
 merge.<driver>.name::
        Defines a human-readable name for a custom low-level