From 23026218b1e51c86798706acd1270c61b4ed1668 Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Fri, 2 Jan 2009 00:02:14 +0000
Subject: For IGNORE_FILES delete the version in the TEMPROOT, not the base.

Submitted by:	clemens fischer <ino-news@spotteswoode.dnsalias.org>
---
 usr.sbin/mergemaster/mergemaster.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr.sbin/mergemaster')

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 0265d75..00f4bde 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -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
-- 
cgit v1.1