Jilles Tjoelker 819b4fd06a mergemaster: Avoid "/var/tmp/temproot disappeared" if there is nothing to ... compare. Because of the change to find in SVN r253886, the entire temproot would be deleted if it became empty, leading to a confusing message "*** FATAL ERROR: The temproot directory ${TEMPROOT} has disappeared!" Note that mergemaster does not do anything useful in this situation anyway (e.g. put IGNORE_FILES="/etc/group /etc/master.passwd" in /etc/mergemaster.rc and run mergemaster -p). As noted in that commit, add -mindepth 1. PR: bin/188485 Submitted by: David Boyd MFC after: 1 week		2014-04-14 22:01:49 +00:00
..
Makefile
mergemaster.8	Remove request to email suggestions and fixes to the author.	2013-06-24 19:57:25 +00:00
mergemaster.sh	mergemaster: Avoid "/var/tmp/temproot disappeared" if there is nothing to	2014-04-14 22:01:49 +00:00