View | Details | Raw Unified | Return to bug 30544
Collapse All | Expand All

(-)usr.sbin/mergemaster//mergemaster.sh (-7 lines)
Lines 200-211 Link Here
200
  done
200
  done
201
  unset NO_INSTALLED
201
  unset NO_INSTALLED
202
  echo ''
202
  echo ''
203
  case "${VERBOSE}" in
204
  '') ;;
205
  *)
206
    sleep 3
207
    ;;
208
  esac
209
}
203
}
210
204
211
# Set the default path for the temporary root environment
205
# Set the default path for the temporary root environment
Lines 338-344 Link Here
338
if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then
332
if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then
339
  echo " *** You have ${PAGER} defined as your pager so we will use that"
333
  echo " *** You have ${PAGER} defined as your pager so we will use that"
340
  echo ''
334
  echo ''
341
  sleep 3
342
fi
335
fi
343
336
344
# Assign the diff flag once so we will not have to keep testing it
337
# Assign the diff flag once so we will not have to keep testing it

Return to bug 30544