dougb 2003/05/02 23:35:19 PDT
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
Preserve directory structure in PRESERVED_FILES_DIR to avoid
filename collisions.
Submitted by: des
Revision Changes Path
1.46 +2 -2 src/usr.sbin/mergemaster/mergemaster.sh