K 10
svn:author
V 3
des
K 8
svn:date
V 27
2016-01-19T12:38:53.591542Z
K 7
svn:log
V 190
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.

END