conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts

diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index ad446b0e8b521d6fb8f779d943889b091b29e701..57aba42e6654e3d32617c3c7b17d18e8dd85852b 100644 (file)
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -73,6 +73,10 @@ imap.preformattedHTML::
        option causes Thunderbird to send the patch as a plain/text,
        format=fixed email.  Default is `false`.
 
+imap.authMethod::
+       Specify authenticate method for authentication with IMAP server.
+       Current supported method is 'CRAM-MD5' only.
+
 Examples
 ~~~~~~~~