Attachment #13553 for bug #25731

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




  # diff_loop function knows how to handle it.
  #
  if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then
    case "${AUTO_RUN}" in
      '')
        diff_loop
        continue
        ;;
      *)
        # If this is an auto run, make it official
        echo "   *** ${COMPFILE} will remain for your consideration"
        continue
        ;;
    esac # Auto run test
  fi

  case "${STRICT}" in

Return to bug 25731

Lines 675-682 Link Here

(-)mergemaster.sh Mon Mar 12 03:07:15 2001 (-2 / +11 lines)
675	# diff_loop function knows how to handle it.	675	# diff_loop function knows how to handle it.
676	#	676	#
677	if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then	677	if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then
678	diff_loop	678	case "${AUTO_RUN}" in
679	continue	679	'')
		680	diff_loop
		681	continue
		682	;;
		683	*)
		684	# If this is an auto run, make it official
		685	echo " *** ${COMPFILE} will remain for your consideration"
		686	continue
		687	;;
		688	esac # Auto run test
680	fi	689	fi
681		690
682	case "${STRICT}" in	691	case "${STRICT}" in