aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2023-01-16 14:52:00 +0000
committerEd Maste <emaste@FreeBSD.org>2023-01-16 15:56:27 +0000
commit9b7eddfeed465d4062dbad178261b806e97d6b62 (patch)
tree100148ba3036de2c79c446af5aad9ab40b6e37be
parentccffe71ad4d9ac01f6bb4efa625ffcaf9fae739f (diff)
downloadsrc-9b7eddfeed465d4062dbad178261b806e97d6b62.tar.gz
src-9b7eddfeed465d4062dbad178261b806e97d6b62.zip
openssh: remove mention of now-unused svn:keywords
Reported by: gshapiro
-rw-r--r--crypto/openssh/FREEBSD-upgrade5
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index b389f399a040..9f6f3d577e01 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -73,10 +73,7 @@
$ git diff --diff-filter=M vendor/openssh/X.YpZ HEAD:crypto/openssh
- Files that have modifications relative to the vendor code, and
- only those files, must have the svn:keywords property set to
- FreeBSD=%H and be listed in the 'keywords' file created by the
- pre-merge script.
+ Review the diff for any unexpected changes.
12) Run the configure script: