From 4ceb4c68e5249c17e6480f3b88c2ac5e69d2ef09 Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Mon, 8 Apr 2002 10:30:44 +0000
Subject: [PATCH] Solve the problem of spuriously comparing files that were
 created in the ${TEMPROOT}/usr/obj directory by deleting them first.

---
 usr.sbin/mergemaster/mergemaster.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 7816a6b71961..960e83eef182 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -528,6 +528,9 @@ esac
 #
 rm -f ${TEMPROOT}/etc/spwd.db ${TEMPROOT}/etc/passwd ${TEMPROOT}/etc/pwd.db
 
+# We only need to compare things like freebsd.cf once
+find ${TEMPROOT}/usr/obj -type f -delete
+
 # Get ready to start comparing files
 
 # Check umask if not specified on the command line,