Stefan Sperling <s...@elego.de> writes: > Could you provide a shell script I can use to actually run the problematic > merge myself in a working copy of the appropriate subdirectory of the FreeBSD > repository?
svn co -q svn://svn.freebsd.org/base/head@338344 cd head/crypto/openssh svn merge --non-interactive -c338344 \^/vendor-crypto/openssh/dist . DES -- Dag-Erling Smørgrav - d...@des.no
