]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4ed23bd) | patch
Update the pre- and post-merge scripts to work correctly after the recent
authordes <des@FreeBSD.org>
Tue, 19 Jan 2016 12:38:53 +0000 (12:38 +0000)
committerdes <des@FreeBSD.org>
Tue, 19 Jan 2016 12:38:53 +0000 (12:38 +0000)
commita5f4b9478d37848cb30b99ef4a000aa29e01be69
tree1f29e78551901e985c8941dec576061bd9fa838ctree | snapshot
parent4ed23bd8873f4a4312b4b02412b889dbe546668ccommit | diff
Update the pre- and post-merge scripts to work correctly after the recent
cleanup.  A round-trip (./freebsd-pre-merge.sh ; ./freebsd-post-merge.sh)
now results in an unchanged working copy.
crypto/openssh/freebsd-post-merge.sh diff | blob | history
crypto/openssh/freebsd-pre-merge.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.