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