Date: Mon, 24 Dec 2007 05:51:45 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200712240551.lBO5pjdh016296@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2007-12-24 05:51:45 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_6_3)
usr.sbin/mergemaster mergemaster.sh
Log:
MFC version 1.55, safety belt for the (unlikely) disappearance of
the temproot before a -r run.
Approved by: re (kensmith)
Revision Changes Path
1.51.8.3.4.1 +7 -0 src/usr.sbin/mergemaster/mergemaster.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712240551.lBO5pjdh016296>
