svn commit: r186688 - head/usr.sbin/mergemaster

[Doug Barton]

Author: dougb
Date: Fri Jan  2 00:02:14 2009
New Revision: 186688
URL: http://svn.freebsd.org/changeset/base/186688

Log:
  For IGNORE_FILES delete the version in the TEMPROOT, not the base.
  
  Submitted by:	clemens fischer <ino-news at spotteswoode.dnsalias.org>

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Thu Jan  1 23:22:01 2009	(r186687)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Fri Jan  2 00:02:14 2009	(r186688)
@@ -644,7 +644,7 @@ case "${RERUN}" in
 
   # Avoid comparing the following user specified files
   for file in ${IGNORE_FILES}; do
-    test -e ${file} && unlink ${file}
+    test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file}
   done
   ;; # End of the "RERUN" test
 esac