1) Replace original with update

r) Replace original with update

2) Delete update, keeping original as is

d) Delete update, keeping original as is

3) Interactively merge original with update

m) Interactively merge original with update

4) Show differences again

s) Show differences again

Please select from the menu above (-1 to ignore this update): "

i) Ignore this update

Please select from the menu above: "

			1) echo "Replacing ${ofile} with ${file}"

			r|R) echo "Replacing ${ofile} with ${file}"

			   mv ${mv_opts} ${file} ${ofile}

			     mv ${mv_opts} ${file} ${ofile}

			   [ -n "${OVERWRITE_ALL}" ] && my_input=-1

			     [ -n "${OVERWRITE_ALL}" ] && my_input=-1

			   continue

			     continue

			   ;;

			     ;;

			2) echo "Deleting ${file}"

			d|D) echo "Deleting ${file}"

			   rm ${rm_opts} ${file}

			     rm ${rm_opts} ${file}

			   [ -n "${DELETE_ALL}" ] && my_input=-1

			     [ -n "${DELETE_ALL}" ] && my_input=-1

			   continue

			     continue

			   ;;

			     ;;

			3) do_merge "${file}" "${ofile}"

			m|M) do_merge "${file}" "${ofile}"

			   my_input=${?}

			     my_input=${?}

#			   [ ${my_input} == 255 ] && my_input=-1

#			     [ ${my_input} == 255 ] && my_input=-1

			   continue

			     continue

			   ;;

			     ;;

			4) continue

			s|S) continue

			   ;;

			     ;;

			*) continue

			  *) continue

			   ;;

			     ;;