Doug Barton f94a6780d9 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.		2010-01-08 00:05:10 +00:00
..
Makefile	Remove MAINTAINER line in favor of the entry in src/MAINTAINERS	2003-06-04 09:38:04 +00:00
mergemaster.8	Update copyright date	2010-01-08 00:05:10 +00:00
mergemaster.sh	Update copyright date	2010-01-08 00:05:10 +00:00