Searched hist:201765 (Results 1 - 2 of 2) sorted by relevance

/freebsd-9.3-release/usr.sbin/mergemaster/
H A Dmergemaster.8diff 201765 Thu Jan 07 22:07:47 MST 2010 dougb Update copyright date

Update delete_temproot() to include the error message if it fails,
and clean up the places where it's called.

If there are no files left in temproot when the comparison is done
delete it without prompting. This should make "automated" runs of
mergemaster without -a a little easier.

Document the new behavior in the man page.
H A Dmergemaster.shdiff 201765 Thu Jan 07 22:07:47 MST 2010 dougb Update copyright date

Update delete_temproot() to include the error message if it fails,
and clean up the places where it's called.

If there are no files left in temproot when the comparison is done
delete it without prompting. This should make "automated" runs of
mergemaster without -a a little easier.

Document the new behavior in the man page.

Completed in 98 milliseconds