aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/freebsd-post-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* Update the pre- and post-merge scripts to work correctly after the recentDag-Erling Smørgrav2016-01-191-4/+4
* Add a pre-merge script which reverts mechanical changes such as addedDag-Erling Smørgrav2014-03-241-0/+14