Merge branch 'da/maint-mergetool-twoway'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 04f5e19dc343d07d48f17e266fa557896f68d43d..abeb82b2c6d40e8557f7a5f8ad4c5e98b3a26a62 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1786,7 +1786,8 @@ rerere.enabled::
        conflict hunks can be resolved automatically, should they be
        encountered again.  By default, linkgit:git-rerere[1] is
        enabled if there is an `rr-cache` directory under the
-       `$GIT_DIR`.
+       `$GIT_DIR`, e.g. if "rerere" was previously used in the
+       repository.
 
 sendemail.identity::
        A configuration identity. When given, causes values in the