Documentation: describe 'union' low-level merge driver

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 659215ac7221d5c8b6aa78bef2fcadce24ada8c3..f0bd2851d8b118711ccf25fcd9c4205dd727b310 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -148,7 +148,7 @@ sendemail.identity::
        'sendemail.<identity>.<item>' will have higher precedence than
        'sendemail.<item>'. This is useful to declare multiple SMTP
        identities and to hoist sensitive authentication information
-       out of the repository and into the global configuation file.
+       out of the repository and into the global configuration file.
 
 sendemail.aliasesfile::
        To avoid typing long email addresses, point this to one or more