mergetool: Fix abort command when resolving symlinks and deleted files

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/git-mergetool.sh b/git-mergetool.sh
index c1fde41a08d296e2647428242490b0b603618d48..9b736507be030cc12ed15960206eb7220dcfe6c1 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -71,13 +71,13 @@ resolve_symlink_merge () {
                cleanup_temp_files --save-backup
                return
                ;;
-          [rR]*)
+           [rR]*)
                git-checkout-index -f --stage=3 -- "$path"
                git-add -- "$path"
                cleanup_temp_files --save-backup
                return
                ;;
-           [qQ]*)
+           [aA]*)
                exit 1
                ;;
            esac
@@ -94,12 +94,12 @@ resolve_deleted_merge () {
                cleanup_temp_files --save-backup
                return
                ;;
-          [dD]*)
+           [dD]*)
                git-rm -- "$path"
                cleanup_temp_files
                return
                ;;
-           [qQ]*)
+           [aA]*)
                exit 1
                ;;
            esac