From: Matt Caswell <matt@openssl.org>
Date: Fri, 3 Jun 2016 09:42:20 +0000 (+0100)
Subject: Further update CONTRIBUTING
X-Git-Tag: OpenSSL_1_1_0-pre6~579
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=4d6013c762dcd8d1eb7d481b7d6df6b5433818fe;hp=073b1b72f61d81f3cf8bc1728d35f9e7e734bbd2

Further update CONTRIBUTING

Tweak to the wording on merge commits.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/CONTRIBUTING b/CONTRIBUTING
index d826e8805f..c60596ebbe 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -57,8 +57,8 @@ the acceptance and review process faster:
 
     3.  Patches should be as current as possible.  When using GitHub, please
     expect to have to rebase and update often. Note that we do not accept merge
-    commits, so please avoid these in any pull request. You will be asked to
-    remove them before a patch is considered acceptable.
+    commits. You will be asked to remove them before a patch is considered
+    acceptable.
 
     4.  Patches should follow our coding style (see
     https://www.openssl.org/policies/codingstyle.html) and compile without