-
Notifications
You must be signed in to change notification settings - Fork 260
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3ab65b6
commit 1e0af1a
Showing
1 changed file
with
10 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -57,4 +57,13 @@ Tests exist, but coverage is very limited. What's covered is a conjunction of | |
(e.g. no automatic checks for renegotiations, parroting quality and such) | ||
|
||
plus we test some other minor things. | ||
Basically, current tests aim to provide a sanity check. | ||
Basically, current tests aim to provide a sanity check. | ||
|
||
# Merging upstream | ||
```Bash | ||
git remote add -f golang [email protected]:golang/go.git | ||
git checkout -b golang-upstream golang/master | ||
git subtree split -P src/crypto/tls/ -b golang-tls-upstream | ||
git checkout master | ||
git merge --no-commit golang-tls-upstream | ||
``` |