config.txt: move mailmap.* to a separate file

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index e8dec1b3c89a66dc2f9e78737fa7d243bee85d37..df2b64dbb618e3cf7c538798f5f18ebc41e7eff6 100644 (file)
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -199,7 +199,7 @@ OPTIONS
        .git/NOTES_MERGE_REF symref is updated to the resulting commit.
 
 --abort::
-       Abort/reset a in-progress 'git notes merge', i.e. a notes merge
+       Abort/reset an in-progress 'git notes merge', i.e. a notes merge
        with conflicts. This simply removes all files related to the
        notes merge.