From 1adffac42bbce6afefbfb16ff50e2c2fd9b30c1d Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 21 Dec 2005 08:59:22 +0000
Subject: [PATCH] Change the default for deleting stale files from yes (which
 violates the general principle that mm should do nothing by default) to no.

PR:		bin/85449
Submitted by:	Kevin Oberman <oberman@es.net>
---
 usr.sbin/mergemaster/mergemaster.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 6ec345a5a78..9a67e43e195 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -809,17 +809,17 @@ if [ -z "${PRE_WORLD}" -a -z "${RERUN}" ]; then
     case "${AUTO_RUN}" in
     '')
       echo ''
-      echo -n '   *** Delete them now? [y] '
+      echo -n '   *** Delete them now? [n] '
       read DELETE_STALE_RC_FILES
       case "${DELETE_STALE_RC_FILES}" in
-      [nN])
-        echo '      *** Files will not be deleted'
-        ;;
-      *)
+      [yY])
         echo '      *** Deleting ... '
         rm ${STALE_RC_FILES}
         echo '                       done.'
         ;;
+      *)
+        echo '      *** Files will not be deleted'
+        ;;
       esac
       sleep 2
       ;;