-# Deleted in both.
-#
-"$1..")
- echo "WARNING: $4 is removed in both branches."
- echo "WARNING: This is a potential rename conflict."
- rm -f -- "$4" || exit 1
- exec git-update-cache --remove -- "$4" ;;
-#
-# Deleted in one and unchanged in the other.