aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/curl.15
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index 51868ec83..d6f85c10d 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -221,7 +221,12 @@ To create remote directories when using FTP or SFTP, try
(FTP) Convert LF to CRLF in upload. Useful for MVS (OS/390).
.IP "--crlfile <file>"
(HTTPS/FTPS) Provide a file using PEM format with a Certificate Revocation
+<<<<<<< curl.1
+List that may specify what peer certificates that are to be considered
+revoked.
+=======
List that may specify peer certificates that are to be considered revoced.
+>>>>>>> 1.278
If this option is used several times, the last one will be used.